| Message ID | 20200502153442.90490-1-zeil@yandex-team.ru |
|---|---|
| State | Accepted |
| Delegated to: | David Miller |
| Headers | show |
| Series | [net-next] inet_diag: bc: read cgroup id only for full sockets | expand |
From: Dmitry Yakunin <zeil@yandex-team.ru> Date: Sat, 2 May 2020 18:34:42 +0300 > Fix bug introduced by commit b1f3e43dbfac ("inet_diag: add support for > cgroup filter"). > > Signed-off-by: Dmitry Yakunin <zeil@yandex-team.ru> > Reported-by: syzbot+ee80f840d9bf6893223b@syzkaller.appspotmail.com > Reported-by: syzbot+13bef047dbfffa5cd1af@syzkaller.appspotmail.com > Fixes: b1f3e43dbfac ("inet_diag: add support for cgroup filter") Applied, thanks.
diff --git a/net/ipv4/inet_diag.c b/net/ipv4/inet_diag.c index 0034092..125f4f8 100644 --- a/net/ipv4/inet_diag.c +++ b/net/ipv4/inet_diag.c @@ -746,7 +746,8 @@ int inet_diag_bc_sk(const struct nlattr *bc, struct sock *sk) else entry.mark = 0; #ifdef CONFIG_SOCK_CGROUP_DATA - entry.cgroup_id = cgroup_id(sock_cgroup_ptr(&sk->sk_cgrp_data)); + entry.cgroup_id = sk_fullsock(sk) ? + cgroup_id(sock_cgroup_ptr(&sk->sk_cgrp_data)) : 0; #endif return inet_diag_bc_run(bc, &entry);
Fix bug introduced by commit b1f3e43dbfac ("inet_diag: add support for cgroup filter"). Signed-off-by: Dmitry Yakunin <zeil@yandex-team.ru> Reported-by: syzbot+ee80f840d9bf6893223b@syzkaller.appspotmail.com Reported-by: syzbot+13bef047dbfffa5cd1af@syzkaller.appspotmail.com Fixes: b1f3e43dbfac ("inet_diag: add support for cgroup filter") --- net/ipv4/inet_diag.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)