netfilter-devel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Holger Eitzenberger <holger@eitzenberger.org>
To: <netfilter-devel@vger.kernel.org>
Cc: <kaber@trash.net>, Holger Eitzenberger <holger.eitzenberger@sophos.com>
Subject: [FIX 1/1] sip: add missing RCU reader lock
Date: Fri, 20 Sep 2013 17:52:18 +0200	[thread overview]
Message-ID: <20130920155817.660882995@eitzenberger.org> (raw)
In-Reply-To: 20130920155217.281613399@eitzenberger.org

[-- Attachment #1: sip-add-missing-RCU-reader-lock.diff --]
[-- Type: text/plain, Size: 984 bytes --]

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.

Signed-off-by: Holger Eitzenberger <holger.eitzenberger@sophos.com>

Index: net-next/net/netfilter/nf_conntrack_sip.c
===================================================================
--- net-next.orig/net/netfilter/nf_conntrack_sip.c
+++ net-next/net/netfilter/nf_conntrack_sip.c
@@ -983,6 +983,7 @@ static int set_expected_rtp_rtcp(struct
 	if (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;
 }
 


  reply	other threads:[~2013-09-20 15:58 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-20 15:52 [FIX 0/1] sip: add missing RCU reader lock in set_expected_rtp_rtcp() Holger Eitzenberger
2013-09-20 15:52 ` Holger Eitzenberger [this message]
2013-09-20 16:55   ` [FIX 1/1] sip: add missing RCU reader lock Patrick McHardy
2013-09-20 20:20     ` Holger Eitzenberger

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20130920155817.660882995@eitzenberger.org \
    --to=holger@eitzenberger.org \
    --cc=holger.eitzenberger@sophos.com \
    --cc=kaber@trash.net \
    --cc=netfilter-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).