From patchwork Mon Dec 24 01:23:16 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cong Wang X-Patchwork-Id: 207999 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 CE2352C0084 for ; Mon, 24 Dec 2012 12:23:39 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752496Ab2LXBXh (ORCPT ); Sun, 23 Dec 2012 20:23:37 -0500 Received: from mail-pb0-f50.google.com ([209.85.160.50]:46518 "EHLO mail-pb0-f50.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752302Ab2LXBXf (ORCPT ); Sun, 23 Dec 2012 20:23:35 -0500 Received: by mail-pb0-f50.google.com with SMTP id wz7so3710357pbc.23 for ; Sun, 23 Dec 2012 17:23:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=x-received:from:to:cc:subject:date:message-id:x-mailer; bh=zQ3jpAtoAKxwcQtx8wU3z2rI3ud3z4WGz2x+PszZF20=; b=JnVaGUW1dI8iEY36dCMi7H6wBk6Uf7G//4P89KMxxf4VVGWqs7gFq53lug4WW33SoX 60Nv8SOUG2n0QnGL0S+1WPp51r5037xQM68IxGbv6JO83Ui2IwmP5UsbyoUKh/Bf03vb qXZtmUXNlH0QmETJ5Q8CNCJPp2dlXR1o40bPonGewWhSRX2klyhPR8D2VREhU0y5/PvA Ppey6uulzUVFEcLZSVl8Rs9MOV818xhveMipoDXN5+2P/Yd8kHODaa6zAjaBFrKQqKRA wrF09HXM07yQxmjPQifqC/nwiEmMJuDCIk1QThbJonfKPSVCjjld1nQ7mPSMQwh8wRm/ GYOg== X-Received: by 10.68.136.163 with SMTP id qb3mr61930511pbb.129.1356312215242; Sun, 23 Dec 2012 17:23:35 -0800 (PST) Received: from cr0.redhat.com ([58.242.81.22]) by mx.google.com with ESMTPS id kl5sm11311076pbc.74.2012.12.23.17.23.30 (version=TLSv1/SSLv3 cipher=OTHER); Sun, 23 Dec 2012 17:23:34 -0800 (PST) From: Cong Wang To: netdev@vger.kernel.org Cc: Sedat Dilek , Eric Dumazet , "David S. Miller" , Julian Anastasov , Cong Wang Subject: [Patch v2] arp: fix a regression in arp_solicit() Date: Mon, 24 Dec 2012 09:23:16 +0800 Message-Id: <1356312196-23185-1-git-send-email-xiyou.wangcong@gmail.com> X-Mailer: git-send-email 1.7.7.6 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org From: Cong Wang Sedat reported the following commit caused a regression: commit 9650388b5c56578fdccc79c57a8c82fb92b8e7f1 Author: Eric Dumazet Date: Fri Dec 21 07:32:10 2012 +0000 ipv4: arp: fix a lockdep splat in arp_solicit This is due to the 6th parameter of arp_send() needs to be NULL for the broadcast case, the above commit changed it to an all-zero array by mistake. Reported-by: Sedat Dilek Tested-by: Sedat Dilek Cc: Sedat Dilek Cc: Eric Dumazet Cc: David S. Miller Cc: Julian Anastasov Signed-off-by: Cong Wang Acked-by: Eric Dumazet --- -- 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/arp.c b/net/ipv4/arp.c index 1169ed4..9547a273 100644 --- a/net/ipv4/arp.c +++ b/net/ipv4/arp.c @@ -321,7 +321,7 @@ static void arp_error_report(struct neighbour *neigh, struct sk_buff *skb) static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb) { __be32 saddr = 0; - u8 dst_ha[MAX_ADDR_LEN]; + u8 dst_ha[MAX_ADDR_LEN], *dst_hw = NULL; struct net_device *dev = neigh->dev; __be32 target = *(__be32 *)neigh->primary_key; int probes = atomic_read(&neigh->probes); @@ -364,8 +364,8 @@ static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb) if (!(neigh->nud_state & NUD_VALID)) pr_debug("trying to ucast probe in NUD_INVALID\n"); neigh_ha_snapshot(dst_ha, neigh, dev); + dst_hw = dst_ha; } else { - memset(dst_ha, 0, dev->addr_len); probes -= neigh->parms->app_probes; if (probes < 0) { #ifdef CONFIG_ARPD @@ -376,7 +376,7 @@ static void arp_solicit(struct neighbour *neigh, struct sk_buff *skb) } arp_send(ARPOP_REQUEST, ETH_P_ARP, target, dev, saddr, - dst_ha, dev->dev_addr, NULL); + dst_hw, dev->dev_addr, NULL); } static int arp_ignore(struct in_device *in_dev, __be32 sip, __be32 tip)