From mboxrd@z Thu Jan 1 00:00:00 1970 From: Taehee Yoo Subject: [PATCH v2 bpf] bpf: devmap: fix wrong interface selection in notifier_call Date: Wed, 24 Oct 2018 20:15:17 +0900 Message-ID: <20181024111517.13361-1-ap420073@gmail.com> Cc: netdev@vger.kernel.org, john.fastabend@gmail.com, ap420073@gmail.com To: daniel@iogearbox.net, ast@kernel.org Return-path: Received: from mail-pf1-f196.google.com ([209.85.210.196]:35395 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1727721AbeJXTnG (ORCPT ); Wed, 24 Oct 2018 15:43:06 -0400 Received: by mail-pf1-f196.google.com with SMTP id l17-v6so2254809pff.2 for ; Wed, 24 Oct 2018 04:15:24 -0700 (PDT) Sender: netdev-owner@vger.kernel.org List-ID: The dev_map_notification() removes interface in devmap if unregistering interface's ifindex is same. But only checking ifindex is not enough because other netns can have same ifindex. so that wrong interface selection could occurred. Hence netdev pointer comparison code is added. v2: compare netdev pointer instead of using net_eq() (Daniel Borkmann) v1: Initial patch Fixes: 2ddf71e23cc2 ("net: add notifier hooks for devmap bpf map") Signed-off-by: Taehee Yoo --- kernel/bpf/devmap.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/kernel/bpf/devmap.c b/kernel/bpf/devmap.c index 141710b82a6c..191b79948424 100644 --- a/kernel/bpf/devmap.c +++ b/kernel/bpf/devmap.c @@ -512,8 +512,7 @@ static int dev_map_notification(struct notifier_block *notifier, struct bpf_dtab_netdev *dev, *odev; dev = READ_ONCE(dtab->netdev_map[i]); - if (!dev || - dev->dev->ifindex != netdev->ifindex) + if (!dev || netdev != dev->dev) continue; odev = cmpxchg(&dtab->netdev_map[i], dev, NULL); if (dev == odev) -- 2.17.1