From patchwork Wed Nov 14 12:51:04 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jiri Pirko X-Patchwork-Id: 198891 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 BC6432C0087 for ; Wed, 14 Nov 2012 23:51:14 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1422794Ab2KNMvM (ORCPT ); Wed, 14 Nov 2012 07:51:12 -0500 Received: from mail-ee0-f46.google.com ([74.125.83.46]:44417 "EHLO mail-ee0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1422711Ab2KNMvK (ORCPT ); Wed, 14 Nov 2012 07:51:10 -0500 Received: by mail-ee0-f46.google.com with SMTP id b15so230567eek.19 for ; Wed, 14 Nov 2012 04:51:09 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=from:to:cc:subject:date:message-id:x-mailer:x-gm-message-state; bh=74bCYfTnW8cXGS0z33gcbkaqiUalaxXvd+h/ea5Ynn0=; b=A4RkbL1Q+1QJYERT4vzhzXqYeZAXICwhMlzn9tmgyDNxi+A0YErV7XFGITQV6wj2jQ 1ow5FM6jnPK3Z3/5+ewA0+RKDmKsw1h8Y6P1zC8t6WwbB5FteVHXMRfc2f1Kjx57KL6L eW9T5L65+mj7QfoRLxcQi19ejK6r7+s2VLf8UbaPg0bDHrwbJunN2l60gOQR1+ydwpdX 2eh4VK8fpxWI6fnQUP0ChykMRpA9dKK+CQP7LfUrVQY+ssiCW5SHPtKPJ5u7I4eqkKz/ KhZ/vdUeexBAF6P3L1nIwxJm2mkTjCqPIE6vk7/LkSRwrOHo50a3d7i30TfsTAG0TDTu +1kQ== Received: by 10.14.220.71 with SMTP id n47mr86524059eep.26.1352897469186; Wed, 14 Nov 2012 04:51:09 -0800 (PST) Received: from localhost (nat-pool-brq-t.redhat.com. [209.132.186.34]) by mx.google.com with ESMTPS id k2sm29408358eep.15.2012.11.14.04.51.07 (version=TLSv1/SSLv3 cipher=OTHER); Wed, 14 Nov 2012 04:51:08 -0800 (PST) From: Jiri Pirko To: netdev@vger.kernel.org Cc: davem@davemloft.net, eric.dumazet@gmail.com, shemminger@vyatta.com, john.r.fastabend@intel.com Subject: [patch net] net: correct check in dev_addr_del() Date: Wed, 14 Nov 2012 13:51:04 +0100 Message-Id: <1352897464-832-1-git-send-email-jiri@resnulli.us> X-Mailer: git-send-email 1.8.0 X-Gm-Message-State: ALoCoQmmd37WlzShMgeMPvVBbD2DSrvim9C1Bp4rB/Z1tf9njSrLI5TCirzCE73XO4BtPD1ft+3M Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org Check (ha->addr == dev->dev_addr) is always true because dev_addr_init() sets this. Correct the check to behave properly on addr removal. Signed-off-by: Jiri Pirko --- net/core/dev_addr_lists.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/net/core/dev_addr_lists.c b/net/core/dev_addr_lists.c index 87cc17d..b079c7b 100644 --- a/net/core/dev_addr_lists.c +++ b/net/core/dev_addr_lists.c @@ -319,7 +319,8 @@ int dev_addr_del(struct net_device *dev, const unsigned char *addr, */ ha = list_first_entry(&dev->dev_addrs.list, struct netdev_hw_addr, list); - if (ha->addr == dev->dev_addr && ha->refcount == 1) + if (!memcmp(ha->addr, addr, dev->addr_len) && + ha->type == addr_type && ha->refcount == 1) return -ENOENT; err = __hw_addr_del(&dev->dev_addrs, addr, dev->addr_len,