X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=blobdiff_plain;f=net%2Fsocket.c;h=4d38d49d6ad91508d4d6cccbc79318c6a5f3f73e;hb=4358bcb54bb9ede559e60685b9e544e723197ca1;hp=b343db1489bdb287d4e7c0d26aa72ef18de07f7f;hpb=43a2898631a8beee66c1d64c1e860f43d96b2e91;p=linux.git

diff --git a/net/socket.c b/net/socket.c
index b343db1489bd..4d38d49d6ad9 100644
--- a/net/socket.c
+++ b/net/socket.c
@@ -2546,7 +2546,12 @@ static int ____sys_recvmsg(struct socket *sock, struct msghdr *msg_sys,
 
 	if (sock->file->f_flags & O_NONBLOCK)
 		flags |= MSG_DONTWAIT;
-	err = (nosec ? sock_recvmsg_nosec : sock_recvmsg)(sock, msg_sys, flags);
+
+	if (unlikely(nosec))
+		err = sock_recvmsg_nosec(sock, msg_sys, flags);
+	else
+		err = sock_recvmsg(sock, msg_sys, flags);
+
 	if (err < 0)
 		goto out;
 	len = err;