From patchwork Sat Oct 2 02:14:55 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Dumazet X-Patchwork-Id: 66535 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 2C1A0B70E0 for ; Sat, 2 Oct 2010 12:15:17 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752059Ab0JBCPB (ORCPT ); Fri, 1 Oct 2010 22:15:01 -0400 Received: from mail-fx0-f46.google.com ([209.85.161.46]:54582 "EHLO mail-fx0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751375Ab0JBCPA (ORCPT ); Fri, 1 Oct 2010 22:15:00 -0400 Received: by fxm14 with SMTP id 14so992146fxm.19 for ; Fri, 01 Oct 2010 19:14:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:received:subject:from:to:cc :content-type:date:message-id:mime-version:x-mailer :content-transfer-encoding; bh=sZLcaeA6zDt4CRSLOQKAB4yUzu7mZ3AFjo8CsyUXnpk=; b=K/qwNQ+b7E0SHuOE22G+KZTVyx7SIWPQm3mloQmZNtvAhbcyUquW6NBW7Xwz07FM8f nihcjAYTsJdkAUT+rUIs7KkEePxHQeA/12US2+O0hWgee0rH85buaas04pBqVy2qmYRa u7woqNLqhondNpTRpwNMi2UZzw8/vixznlp1M= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=subject:from:to:cc:content-type:date:message-id:mime-version :x-mailer:content-transfer-encoding; b=NdP+fiMuxD992WcZXHIIcZ3gxtOldEh0sMlWSifhrkKBeLlL45OJUqDo3rZtPxQn43 Jh/sYNMgCiPGofKI1X+qbFsv3/JSNFbSfQabGRDYfaKi6JbGSX4CWmh2ZTn2tKr8zVrh ReBoGT2hTxgV51fL7Ueaw7vR0d688GS4zXONM= Received: by 10.223.118.73 with SMTP id u9mr6253461faq.36.1285985699635; Fri, 01 Oct 2010 19:14:59 -0700 (PDT) Received: from [10.150.51.210] (gw0.net.jmsp.net [212.23.165.14]) by mx.google.com with ESMTPS id a16sm970161fai.1.2010.10.01.19.14.58 (version=SSLv3 cipher=RC4-MD5); Fri, 01 Oct 2010 19:14:58 -0700 (PDT) Subject: [PATCH net-next 1/4] ipmr: __pim_rcv() is called under rcu_read_lock From: Eric Dumazet To: David Miller Cc: netdev Date: Sat, 02 Oct 2010 04:14:55 +0200 Message-ID: <1285985695.2582.521.camel@edumazet-laptop> Mime-Version: 1.0 X-Mailer: Evolution 2.30.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org No need to get a reference on reg_dev and release it, we are in a rcu_read_lock() protected section. Signed-off-by: Eric Dumazet --- net/ipv4/ipmr.c | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/net/ipv4/ipmr.c b/net/ipv4/ipmr.c index 10b24c0..1a92ebd 100644 --- a/net/ipv4/ipmr.c +++ b/net/ipv4/ipmr.c @@ -1805,6 +1805,7 @@ dont_forward: } #ifdef CONFIG_IP_PIMSM +/* called with rcu_read_lock() */ static int __pim_rcv(struct mr_table *mrt, struct sk_buff *skb, unsigned int pimlen) { @@ -1826,26 +1827,23 @@ static int __pim_rcv(struct mr_table *mrt, struct sk_buff *skb, read_lock(&mrt_lock); if (mrt->mroute_reg_vif_num >= 0) reg_dev = mrt->vif_table[mrt->mroute_reg_vif_num].dev; - if (reg_dev) - dev_hold(reg_dev); read_unlock(&mrt_lock); if (reg_dev == NULL) return 1; skb->mac_header = skb->network_header; - skb_pull(skb, (u8*)encap - skb->data); + skb_pull(skb, (u8 *)encap - skb->data); skb_reset_network_header(skb); skb->protocol = htons(ETH_P_IP); - skb->ip_summed = 0; + skb->ip_summed = CHECKSUM_NONE; skb->pkt_type = PACKET_HOST; skb_tunnel_rx(skb, reg_dev); netif_rx(skb); - dev_put(reg_dev); - return 0; + return NET_RX_SUCCESS; } #endif