From: Miaohe Lin <linmiaohe@huawei.com>
Date: Thu, 6 Aug 2020 11:53:16 +0000 (+0800)
Subject: net: Set fput_needed iff FDPUT_FPUT is set
X-Git-Tag: v5.4.59~49
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=7bedf1d86298c98240add8fcd8eafd8f2d9f2d2f;p=users%2Fdwmw2%2Flinux.git

net: Set fput_needed iff FDPUT_FPUT is set

[ Upstream commit ce787a5a074a86f76f5d3fd804fa78e01bfb9e89 ]

We should fput() file iff FDPUT_FPUT is set. So we should set fput_needed
accordingly.

Fixes: 00e188ef6a7e ("sockfd_lookup_light(): switch to fdget^W^Waway from fget_light")
Signed-off-by: Miaohe Lin <linmiaohe@huawei.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/net/socket.c b/net/socket.c
index 432800b39ddb9..d1a0264401b7f 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -485,7 +485,7 @@ static struct socket *sockfd_lookup_light(int fd, int *err, int *fput_needed)
 	if (f.file) {
 		sock = sock_from_file(f.file, err);
 		if (likely(sock)) {
-			*fput_needed = f.flags;
+			*fput_needed = f.flags & FDPUT_FPUT;
 			return sock;
 		}
 		fdput(f);