From patchwork Fri Jun 29 15:37:35 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pablo Neira Ayuso X-Patchwork-Id: 168154 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id AC6C6B7005 for ; Sat, 30 Jun 2012 01:38:03 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756163Ab2F2Ph7 (ORCPT ); Fri, 29 Jun 2012 11:37:59 -0400 Received: from mail.us.es ([193.147.175.20]:38959 "EHLO mail.us.es" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756149Ab2F2Phu (ORCPT ); Fri, 29 Jun 2012 11:37:50 -0400 Received: (qmail 25478 invoked from network); 29 Jun 2012 17:37:48 +0200 Received: from unknown (HELO us.es) (192.168.2.12) by us.es with SMTP; 29 Jun 2012 17:37:48 +0200 Received: (qmail 3110 invoked by uid 507); 29 Jun 2012 15:37:47 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on antivirus2 X-Spam-Level: X-Spam-Status: No, score=-98.0 required=7.5 tests=BAYES_80, USER_IN_WHITELIST autolearn=disabled version=3.3.1 Received: from 127.0.0.1 by antivirus2 (envelope-from , uid 501) with qmail-scanner-2.08 (clamdscan: 0.97.5/15100. Clear:RC:1(127.0.0.1):. Processed in 0.026637 secs); 29 Jun 2012 15:37:47 -0000 Received: from unknown (HELO antivirus2) (127.0.0.1) by us.es with SMTP; 29 Jun 2012 15:37:47 -0000 Received: from 192.168.1.13 (192.168.1.13) by antivirus2 (F-Secure/fsigk_smtp/407/antivirus2); Fri, 29 Jun 2012 17:37:47 +0200 (CEST) X-Virus-Status: clean(F-Secure/fsigk_smtp/407/antivirus2) Received: (qmail 26488 invoked from network); 29 Jun 2012 17:39:27 +0200 Received: from 1984.lsi.us.es (HELO localhost.localdomain) (pneira@us.es@150.214.188.80) by us.es with SMTP; 29 Jun 2012 17:39:27 +0200 From: pablo@netfilter.org To: netfilter-devel@vger.kernel.org Cc: davem@davemloft.net, netdev@vger.kernel.org Subject: [PATCH 5/5] netfilter: nfnetlink: fix missing rcu_read_unlock in nfnetlink_rcv_msg Date: Fri, 29 Jun 2012 17:37:35 +0200 Message-Id: <1340984255-738-6-git-send-email-pablo@netfilter.org> X-Mailer: git-send-email 1.7.2.5 In-Reply-To: <1340984255-738-1-git-send-email-pablo@netfilter.org> References: <1340984255-738-1-git-send-email-pablo@netfilter.org> Sender: netfilter-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netfilter-devel@vger.kernel.org From: Tomasz Bursztyka Bug added in commit 6b75e3e8d664a9a (netfilter: nfnetlink: add RCU in nfnetlink_rcv_msg()) Signed-off-by: Tomasz Bursztyka Acked-by: Eric Dumazet Signed-off-by: Pablo Neira Ayuso --- net/netfilter/nfnetlink.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/netfilter/nfnetlink.c b/net/netfilter/nfnetlink.c index 3e797d1..791d56b 100644 --- a/net/netfilter/nfnetlink.c +++ b/net/netfilter/nfnetlink.c @@ -169,8 +169,10 @@ replay: err = nla_parse(cda, ss->cb[cb_id].attr_count, attr, attrlen, ss->cb[cb_id].policy); - if (err < 0) + if (err < 0) { + rcu_read_unlock(); return err; + } if (nc->call_rcu) { err = nc->call_rcu(net->nfnl, skb, nlh,