Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20;
Date:   Fri, 5 May 2023 17:06:41 +0800 (CST)
Message-ID: <202305051706416319733@zte.com.cn>
Mime-Version: 1.0
From:   <ye.xingchen@zte.com.cn>
To:     <davem@davemloft.net>
Cc:     <edumazet@google.com>, <kuba@kernel.org>, <pabeni@redhat.com>,
        <netdev@vger.kernel.org>, <linux-kernel@vger.kernel.org>
Subject: =?UTF-8?B?W1BBVENIXSBuZXQ6IHNvY2tldDogVXNlIGZkZ2V0KCkgYW5kIGZkcHV0KCk=?=
Content-Type: text/plain;
        charset="UTF-8"
Precedence: bulk

From: Ye Xingchen <ye.xingchen@zte.com.cn>

By using the fdget function, the socket object, can be quickly obtained
from the process's file descriptor table without the need to obtain the
file descriptor first before passing it as a parameter to the fget
function.

Signed-off-by: Ye Xingchen <ye.xingchen@zte.com.cn>
---
 net/socket.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/net/socket.c b/net/socket.c
index a7b4b37d86df..84daba774432 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -528,19 +528,18 @@ EXPORT_SYMBOL(sock_from_file);

 struct socket *sockfd_lookup(int fd, int *err)
 {
-	struct file *file;
+	struct fd f = fdget(fd);
 	struct socket *sock;

-	file = fget(fd);
-	if (!file) {
+	if (!f.file) {
 		*err = -EBADF;
 		return NULL;
 	}

-	sock = sock_from_file(file);
+	sock = sock_from_file(f.file);
 	if (!sock) {
 		*err = -ENOTSOCK;
-		fput(file);
+		fdput(f);
 	}
 	return sock;
 }
-- 
2.25.1