sip: add missing RCU reader lock in set_expected_rtp_rtcp()
Subsystems (2)
cover sip: add missing RCU reader lock in set_expected_rtp_rtcp()
I noticed that set_expected_rtp_rtcp() in net-next misses a 2nd RCU reader lock when dereferencing the 2nd hook function. Same bug is present in kernel v3.8 at least.
It is not simply a matter of extending the RCU read protected area because there is a conditional return in between:
if (skip_expect)
return NF_ACCEPT;Please check the RCU usage. I see e. g. that nf_ct_expect_related(), takes nf_conntrack_lock, but my understanding of RCU is that this is ok.
Thanks.
/Holger
PATCH 1/1 sip: add missing RCU reader lock
Currently set_expected_rtp_rtcp() in the SIP helper uses rcu_dereference() two times to access two different NAT hook functions. However, only the first one is protected properly by the RCU reader lock, but the 2nd isn't.
I chose to not just extend the first RCU protected area but putting the rcu_read_unlock() down, because there is a 'return' in between.
net/netfilter/nf_conntrack_sip.c +2 -0
@@ -983,6 +983,7 @@ static int set_expected_rtp_rtcp(structif (skip_expect)return NF_ACCEPT ; +rcu_read_lock (); rtp_exp =nf_ct_expect_alloc (ct);if (rtp_exp ==NULL ) goto err1;
@@ -1012,6 +1013,7 @@ static int set_expected_rtp_rtcp(struct err2:nf_ct_expect_put (rtp_exp); err1: +rcu_read_unlock ();return ret; }
Re: [FIX 1/1] sip: add missing RCU reader lock
Quoted 4 lines · Holger Eitzenberger
Currently
set_expected_rtp_rtcp()in the SIP helper usesrcu_dereference()two times to access two different NAT hook functions. However, only the first one is protected properly by the RCU reader lock, but the 2nd isn't.
Its more a cosmetic thing since we rely on all netfilter hooks being rcu_read_lock()ed by nf_hook_slow() in many places anyways.
Quoted 2 lines
I chose to not just extend the first RCU protected area but putting the
rcu_read_unlock()down, because there is a 'return' in between.
I'd suggest to do that since your patch still doesn't cover the direct_rtp nf_nat_sdp_port_hook dereference. Actually with your patch we have unbalanced RCU locking since the direct_rtp case contains a "goto err1".
Quoted 23 lines
Signed-off-by Holger Eitzenberger <[email protected]>Index:
net-next/net/netfilter/nf_conntrack_sip.c
===================================================================net/netfilter/nf_conntrack_sip.c +2
-0@@ -983,6 +983,7 @@ static int set_expected_rtp_rtcp(structif (skip_expect)return NF_ACCEPT ; +rcu_read_lock (); rtp_exp =nf_ct_expect_alloc (ct);if (rtp_exp ==NULL ) goto err1;@@ -1012,6 +1013,7 @@ static int set_expected_rtp_rtcp(struct err2:nf_ct_expect_put (rtp_exp); err1: +rcu_read_unlock ();return ret; }
Re: [FIX 1/1] sip: add missing RCU reader lock
Quoted 8 lines
Quoted 3 lines
I chose to not just extend the first RCU protected area but putting the
rcu_read_unlock()down, because there is a 'return' in between.I'd suggest to do that since your patch still doesn't cover the
direct_rtpnf_nat_sdp_port_hookdereference. Actually with your patch we have unbalanced RCU locking since thedirect_rtpcase contains a "goto err1".
Sure, I'll send a 2nd patch in a new thread.
/Holger