af_unix: check socket state when queuing OOB
Subsystems (3)
PATCH 1/1 af_unix: check socket state when queuing OOB
[email protected] pointed out that queue_oob does not check socket state after acquiring the lock. He also pointed to an incorrect usage of kfree_skb and an unnecessary setting of skb length. This patch addresses those issue.
--- net/unix/af_unix.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
net/unix/af_unix.c +9 -2
@@ -1891,7 +1891,6 @@ static int queue_oob(struct socket *sock, struct msghdr *msg, struct sock *otherreturn err;skb_put (skb,1 ); - skb->len =1 ; err =skb_copy_datagram_from_iter (skb,0 , &msg->msg_iter,1 );if (err) {
@@ -1900,11 +1899,19 @@ static int queue_oob(struct socket *sock, struct msghdr *msg, struct sock *other }unix_state_lock (other); + +if (sock_flag (other,SOCK_DEAD ) || + (other->sk_shutdown &RCV_SHUTDOWN )) { +unix_state_unlock (other); +kfree_skb (skb); +return -EPIPE ; + } +maybe_add_creds (skb, sock, other);skb_get (skb);if (ousk->oob_skb) -kfree_skb (ousk->oob_skb); +consume_skb (ousk->oob_skb); ousk->oob_skb = skb;
Signature · 1 line
2.27.0
This patch was applied to netdev/net-next.git (refs/heads/master):
Hello:
This patch was applied to netdev/net-next.git (refs/heads/master):
Quoted 9 lines · On Fri, 13 Aug 2021 11:19:34 -0700 you wrote:
[email protected] pointed out that
queue_oobdoes not check socket state after acquiring the lock. He also pointed to an incorrect usage ofkfree_skband an unnecessary setting of skb length. This patch addresses those issue.Signed-off-by Rao Shoaib <[email protected]>[...]
Here is the summary with links:
- af_unix: check socket state when queuing OOB
https://git.kernel.org/netdev/net-next/c/19eed7210793
You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html