Skip to content

Commit 2aab4b9

Browse files
Eric Dumazetkuba-moo
Eric Dumazet
authored andcommitted
af_unix: fix struct pid leaks in OOB support
syzbot reported struct pid leak [1]. Issue is that queue_oob() calls maybe_add_creds() which potentially holds a reference on a pid. But skb->destructor is not set (either directly or by calling unix_scm_to_skb()) This means that subsequent kfree_skb() or consume_skb() would leak this reference. In this fix, I chose to fully support scm even for the OOB message. [1] BUG: memory leak unreferenced object 0xffff8881053e7f80 (size 128): comm "syz-executor242", pid 5066, jiffies 4294946079 (age 13.220s) hex dump (first 32 bytes): 01 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 ................ backtrace: [<ffffffff812ae26a>] alloc_pid+0x6a/0x560 kernel/pid.c:180 [<ffffffff812718df>] copy_process+0x169f/0x26c0 kernel/fork.c:2285 [<ffffffff81272b37>] kernel_clone+0xf7/0x610 kernel/fork.c:2684 [<ffffffff812730cc>] __do_sys_clone+0x7c/0xb0 kernel/fork.c:2825 [<ffffffff849ad699>] do_syscall_x64 arch/x86/entry/common.c:50 [inline] [<ffffffff849ad699>] do_syscall_64+0x39/0xb0 arch/x86/entry/common.c:80 [<ffffffff84a0008b>] entry_SYSCALL_64_after_hwframe+0x63/0xcd Fixes: 314001f ("af_unix: Add OOB support") Reported-by: [email protected] Signed-off-by: Eric Dumazet <[email protected]> Cc: Rao Shoaib <[email protected]> Reviewed-by: Kuniyuki Iwashima <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Jakub Kicinski <[email protected]>
1 parent 8f14820 commit 2aab4b9

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

net/unix/af_unix.c

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2105,7 +2105,8 @@ static int unix_dgram_sendmsg(struct socket *sock, struct msghdr *msg,
21052105
#define UNIX_SKB_FRAGS_SZ (PAGE_SIZE << get_order(32768))
21062106

21072107
#if IS_ENABLED(CONFIG_AF_UNIX_OOB)
2108-
static int queue_oob(struct socket *sock, struct msghdr *msg, struct sock *other)
2108+
static int queue_oob(struct socket *sock, struct msghdr *msg, struct sock *other,
2109+
struct scm_cookie *scm, bool fds_sent)
21092110
{
21102111
struct unix_sock *ousk = unix_sk(other);
21112112
struct sk_buff *skb;
@@ -2116,6 +2117,11 @@ static int queue_oob(struct socket *sock, struct msghdr *msg, struct sock *other
21162117
if (!skb)
21172118
return err;
21182119

2120+
err = unix_scm_to_skb(scm, skb, !fds_sent);
2121+
if (err < 0) {
2122+
kfree_skb(skb);
2123+
return err;
2124+
}
21192125
skb_put(skb, 1);
21202126
err = skb_copy_datagram_from_iter(skb, 0, &msg->msg_iter, 1);
21212127

@@ -2243,7 +2249,7 @@ static int unix_stream_sendmsg(struct socket *sock, struct msghdr *msg,
22432249

22442250
#if IS_ENABLED(CONFIG_AF_UNIX_OOB)
22452251
if (msg->msg_flags & MSG_OOB) {
2246-
err = queue_oob(sock, msg, other);
2252+
err = queue_oob(sock, msg, other, &scm, fds_sent);
22472253
if (err)
22482254
goto out_err;
22492255
sent++;

0 commit comments

Comments
 (0)