• Florian Westphal's avatar
    netfilter: nfnetlink: fix warn in nfnetlink_unbind · ffd219ef
    Florian Westphal authored
    syzbot reports following warn:
    WARNING: CPU: 0 PID: 3600 at net/netfilter/nfnetlink.c:703 nfnetlink_unbind+0x357/0x3b0 net/netfilter/nfnetlink.c:694
    
    The syzbot generated program does this:
    
    socket(AF_NETLINK, SOCK_RAW, NETLINK_NETFILTER) = 3
    setsockopt(3, SOL_NETLINK, NETLINK_DROP_MEMBERSHIP, [1], 4) = 0
    
    ... which triggers 'WARN_ON_ONCE(nfnlnet->ctnetlink_listeners == 0)' check.
    
    Instead of counting, just enable reporting for every bind request
    and check if we still have listeners on unbind.
    
    While at it, also add the needed bounds check on nfnl_group2type[]
    access.
    
    Reported-by: <syzbot+4903218f7fba0a2d6226@syzkaller.appspotmail.com>
    Reported-by: <syzbot+afd2d80e495f96049571@syzkaller.appspotmail.com>
    Fixes: 2794cdb0 ("netfilter: nfnetlink: allow to detect if ctnetlink listeners exist")
    Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
    Signed-off-by: default avatarPablo Neira Ayuso <pablo@netfilter.org>
    ffd219ef
nfnetlink.c 18.2 KB