af_unix: Don't pass struct socket to maybe_add_creds().

We will move SOCK_PASS{CRED,PIDFD,SEC} from struct socket.flags
to struct sock for better handling with SOCK_PASSRIGHTS.

Then, we don't need to access struct socket in maybe_add_creds().

Let's pass struct sock to maybe_add_creds() and its caller
queue_oob().

While at it, we append the unix_ prefix and fix double spaces
around the pid assignment.

Signed-off-by: Kuniyuki Iwashima <kuniyu@amazon.com>
Reviewed-by: Willem de Bruijn <willemb@google.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/net/unix/af_unix.c b/net/unix/af_unix.c
index 464e183ffdb83314c04ecd05b4abd86071518273..a39497fd6e98c4acabbb59dd57f3b8950c6c6efe 100644 (file)
--- a/net/unix/af_unix.c
+++ b/net/unix/af_unix.c
@@ -1869,7 +1869,7 @@ static int unix_scm_to_skb(struct scm_cookie *scm, struct sk_buff *skb, bool sen
 {
        int err = 0;
 
-       UNIXCB(skb).pid  = get_pid(scm->pid);
+       UNIXCB(skb).pid = get_pid(scm->pid);
        UNIXCB(skb).uid = scm->creds.uid;
        UNIXCB(skb).gid = scm->creds.gid;
        UNIXCB(skb).fp = NULL;
@@ -1886,15 +1886,15 @@ static int unix_scm_to_skb(struct scm_cookie *scm, struct sk_buff *skb, bool sen
  * We include credentials if source or destination socket
  * asserted SOCK_PASSCRED.
  */
-static void maybe_add_creds(struct sk_buff *skb, const struct socket *sock,
-                           const struct sock *other)
+static void unix_maybe_add_creds(struct sk_buff *skb, const struct sock *sk,
+                                const struct sock *other)
 {
        if (UNIXCB(skb).pid)
                return;
 
-       if (unix_may_passcred(sock->sk) ||
+       if (unix_may_passcred(sk) ||
            !other->sk_socket || unix_may_passcred(other)) {
-               UNIXCB(skb).pid  = get_pid(task_tgid(current));
+               UNIXCB(skb).pid = get_pid(task_tgid(current));
                current_uid_gid(&UNIXCB(skb).uid, &UNIXCB(skb).gid);
        }
 }
@@ -2133,7 +2133,8 @@ restart_locked:
 
        if (sock_flag(other, SOCK_RCVTSTAMP))
                __net_timestamp(skb);
-       maybe_add_creds(skb, sock, other);
+
+       unix_maybe_add_creds(skb, sk, other);
        scm_stat_add(other, skb);
        skb_queue_tail(&other->sk_receive_queue, skb);
        unix_state_unlock(other);
@@ -2161,14 +2162,14 @@ out:
 #define UNIX_SKB_FRAGS_SZ (PAGE_SIZE << get_order(32768))
 
 #if IS_ENABLED(CONFIG_AF_UNIX_OOB)
-static int queue_oob(struct socket *sock, struct msghdr *msg, struct sock *other,
+static int queue_oob(struct sock *sk, struct msghdr *msg, struct sock *other,
                     struct scm_cookie *scm, bool fds_sent)
 {
        struct unix_sock *ousk = unix_sk(other);
        struct sk_buff *skb;
        int err;
 
-       skb = sock_alloc_send_skb(sock->sk, 1, msg->msg_flags & MSG_DONTWAIT, &err);
+       skb = sock_alloc_send_skb(sk, 1, msg->msg_flags & MSG_DONTWAIT, &err);
 
        if (!skb)
                return err;
@@ -2192,7 +2193,7 @@ static int queue_oob(struct socket *sock, struct msghdr *msg, struct sock *other
                goto out;
        }
 
-       maybe_add_creds(skb, sock, other);
+       unix_maybe_add_creds(skb, sk, other);
        scm_stat_add(other, skb);
 
        spin_lock(&other->sk_receive_queue.lock);
@@ -2308,7 +2309,7 @@ static int unix_stream_sendmsg(struct socket *sock, struct msghdr *msg,
                    (other->sk_shutdown & RCV_SHUTDOWN))
                        goto out_pipe_unlock;
 
-               maybe_add_creds(skb, sock, other);
+               unix_maybe_add_creds(skb, sk, other);
                scm_stat_add(other, skb);
                skb_queue_tail(&other->sk_receive_queue, skb);
                unix_state_unlock(other);
@@ -2318,7 +2319,7 @@ static int unix_stream_sendmsg(struct socket *sock, struct msghdr *msg,
 
 #if IS_ENABLED(CONFIG_AF_UNIX_OOB)
        if (msg->msg_flags & MSG_OOB) {
-               err = queue_oob(sock, msg, other, &scm, fds_sent);
+               err = queue_oob(sk, msg, other, &scm, fds_sent);
                if (err)
                        goto out_err;
                sent++;