Merge tag 'net-next-5.19' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev...

[linux.git] / net / unix / af_unix.c

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index fecbd95da9185eac29ee8cdd0e0a0e6520b4a0ce..654dcef7cfb3849463be9d905ae625319fbae406 100644 (file)
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1809,11 +1809,9 @@ static int maybe_init_creds(struct scm_cookie *scm,
 static bool unix_skb_scm_eq(struct sk_buff *skb,
                            struct scm_cookie *scm)
 {
-       const struct unix_skb_parms *u = &UNIXCB(skb);
-
-       return u->pid == scm->pid &&
-              uid_eq(u->uid, scm->creds.uid) &&
-              gid_eq(u->gid, scm->creds.gid) &&
+       return UNIXCB(skb).pid == scm->pid &&
+              uid_eq(UNIXCB(skb).uid, scm->creds.uid) &&
+              gid_eq(UNIXCB(skb).gid, scm->creds.gid) &&
               unix_secdata_eq(scm, skb);
 }
 
@@ -2484,8 +2482,7 @@ static int unix_dgram_recvmsg(struct socket *sock, struct msghdr *msg, size_t si
        const struct proto *prot = READ_ONCE(sk->sk_prot);
 
        if (prot != &unix_dgram_proto)
-               return prot->recvmsg(sk, msg, size, flags & MSG_DONTWAIT,
-                                           flags & ~MSG_DONTWAIT, NULL);
+               return prot->recvmsg(sk, msg, size, flags, NULL);
 #endif
        return __unix_dgram_recvmsg(sk, msg, size, flags);
 }
@@ -2917,8 +2914,7 @@ static int unix_stream_recvmsg(struct socket *sock, struct msghdr *msg,
        const struct proto *prot = READ_ONCE(sk->sk_prot);
 
        if (prot != &unix_stream_proto)
-               return prot->recvmsg(sk, msg, size, flags & MSG_DONTWAIT,
-                                           flags & ~MSG_DONTWAIT, NULL);
+               return prot->recvmsg(sk, msg, size, flags, NULL);
 #endif
        return unix_stream_read_generic(&state, true);
 }