netdev - nf_conntrack_h323: Fix locking in process

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [thread-next>] [day] [month] [year] [list]

Message-ID: <1452894918.4622.3.camel@gmail.com>
Date:	Fri, 15 Jan 2016 22:55:18 +0100
From:	Sebastian Pöhn <sebastian.poehn@...il.com>
To:	netdev@...r.kernel.org
Subject: nf_conntrack_h323: Fix locking in process_urq

nf_ct_remove_expectations has to be called under nf_conntrack_expect_lock
    
Signed-off-by: Sebastian Pöhn <sebastian.poehn@...il.com>

---

diff --git a/net/netfilter/nf_conntrack_h323_main.c b/net/netfilter/nf_conntrack_h323_main.c
index 9511af0..d477375 100644
--- a/net/netfilter/nf_conntrack_h323_main.c
+++ b/net/netfilter/nf_conntrack_h323_main.c
@@ -1518,7 +1518,9 @@ static int process_urq(struct sk_buff *skb, struct nf_conn *ct,
        }
 
        /* Clear old expect */
+       spin_lock_bh(&nf_conntrack_expect_lock);
        nf_ct_remove_expectations(ct);
+       spin_unlock_bh(&nf_conntrack_expect_lock);
        info->sig_port[dir] = 0;
        info->sig_port[!dir] = 0;