Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 406fb2bc authored by Kuniyuki Iwashima's avatar Kuniyuki Iwashima Committed by Greg Kroah-Hartman
Browse files

af_unix: Remove put_pid()/put_cred() in copy_peercred(). 



[ Upstream commit e4bd881d987121dbf1a288641491955a53d9f8f7 ]

When (AF_UNIX, SOCK_STREAM) socket connect()s to a listening socket,
the listener's sk_peer_pid/sk_peer_cred are copied to the client in
copy_peercred().

Then, the client's sk_peer_pid and sk_peer_cred are always NULL, so
we need not call put_pid() and put_cred() there.

Signed-off-by: default avatarKuniyuki Iwashima <kuniyu@amazon.com>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 1d755d4f

net/unix/af_unix.c

+1 −8
Original line number Diff line number Diff line
@@ -610,9 +610,6 @@ static void init_peercred(struct sock *sk) 


static void copy_peercred(struct sock *sk, struct sock *peersk)

{

	const struct cred *old_cred;

	struct pid *old_pid;



	if (sk < peersk) {

		spin_lock(&sk->sk_peer_lock);

		spin_lock_nested(&peersk->sk_peer_lock, SINGLE_DEPTH_NESTING);
@@ -620,16 +617,12 @@ static void copy_peercred(struct sock *sk, struct sock *peersk) 
		spin_lock(&peersk->sk_peer_lock);

		spin_lock_nested(&sk->sk_peer_lock, SINGLE_DEPTH_NESTING);

	}

	old_pid = sk->sk_peer_pid;

	old_cred = sk->sk_peer_cred;



	sk->sk_peer_pid  = get_pid(peersk->sk_peer_pid);

	sk->sk_peer_cred = get_cred(peersk->sk_peer_cred);



	spin_unlock(&sk->sk_peer_lock);

	spin_unlock(&peersk->sk_peer_lock);



	put_pid(old_pid);

	put_cred(old_cred);

}



static int unix_listen(struct socket *sock, int backlog)