From patchwork Fri Oct 16 20:24:19 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Fertser X-Patchwork-Id: 1383529 X-Patchwork-Delegate: ynezz@true.cz Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.openwrt.org (client-ip=2001:8b0:10b:1231::1; helo=merlin.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=merlin.20170209 header.b=TX+TQ8zf; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=eoSCIQI7; dkim-atps=neutral Received: from merlin.infradead.org (merlin.infradead.org [IPv6:2001:8b0:10b:1231::1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4CCd3n51XPz9sTv for ; Sat, 17 Oct 2020 07:27:01 +1100 (AEDT) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=merlin.20170209; h=Sender:Content-Transfer-Encoding: Content-Type:Cc:List-Subscribe:List-Help:List-Post:List-Archive: List-Unsubscribe:List-Id:MIME-Version:Message-Id:Date:Subject:To:From: Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender :Resent-To:Resent-Cc:Resent-Message-ID:In-Reply-To:References:List-Owner; bh=khcI4Gchl4T+YwL7XGMJToimHaZM7J3JC5icwsun1sc=; b=TX+TQ8zfEL1BSxW1uwjaFJvFEo VT4SHbOuy3qHBrC60TcLwtCo6SYShkJnjiJoIS/Q1AYtZT8A9h82LaMoUujQjFdPlnVyeTa3RDucL w4DplG0dpBhCsDb3pqhgc2SS77C1HD9yheLB++DZQUEUBD9maf5/tcEXzDms/xNkaE6X/3GXtzVE8 2d3PtRr08q/1Eolz0a/kYJTZj4hKOgJ1fWMiDQ9t78ud2mUmhJcUPeB9qxJPojA0xUSe7FVAxuFdm rjr/GkiUwJg81cj/8ritEWo2jiDLR1b9xSiw89hRcpwmOQ0lfGTV9aZ/kkC/3VpCTJsWMBis3bVL5 X7gDr9Ug==; Received: from localhost ([::1] helo=merlin.infradead.org) by merlin.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1kTWHG-0001Oi-H4; Fri, 16 Oct 2020 20:24:38 +0000 Received: from mail-lf1-x144.google.com ([2a00:1450:4864:20::144]) by merlin.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1kTWHD-0001OG-Mb for openwrt-devel@lists.openwrt.org; Fri, 16 Oct 2020 20:24:36 +0000 Received: by mail-lf1-x144.google.com with SMTP id a9so4615688lfc.7 for ; Fri, 16 Oct 2020 13:24:33 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ggoyV9w/L9PJZaUYWyxlQDSC5XW8Ve2TVDbFcLNOyhY=; b=eoSCIQI7ru6pcK9dycpGnzECadoQtyAHrR1y7aeEGsbNA3dsebdMNJSz+qUkB/XlyQ OjWg17t8KFFB95lT8+Q4XwII+jJKO9cOSQX8xnn/WC31HTYLurM15qqg9MJ0469hDali UsgGzmAW1ZBYPRz+SiT6oMuQh/yZfpyxMx9XbnCRmBgfMfh3RalHlmHtHxNXJpNKH1g0 qX7rJevNRW/irE41ywUu85Ihi496j4zIEVJbLVL/hcg5L/ys2nGKa1AWvx3wajPxRl5X AOkIDRDv9crg2n9GSt3w6uf6mhwAUojk1QE7avsO3i9abAox/vL/Ss1a3hZ/2a41JtIE iJiA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=ggoyV9w/L9PJZaUYWyxlQDSC5XW8Ve2TVDbFcLNOyhY=; b=Gkr8CvJ8CEB5mZdx+4bjilbHE15RmBS2anIV8Y35iZ4ONo3vQS13mYadHBaRsAA9fR 1AztHM1FNWrjmw0sF/1JBIKuWq0+NGPl2ax9R6jAOe2noIZQ1YKmBO/gLq1h+aIepAtW CgMVEEFbA8O9dvAtZedY2AyGF4pDOR9cQiUzVyw/QNIhyeXi4aVR0xoaHHiIdQUsSzrF qKJHB2GguQ0OpDXkVfEH03LRfO/4Y6OHVR31upzuC4X2YpTuHD8fwGNF9iqiJTMupEdz rhavnAvHNEBsNE2TAkjYegOmvrspCwQ5rR8iADZE+f6XUBNeAmhN+/dC0O+JTWCXoUzP YXyw== X-Gm-Message-State: AOAM5319Pl8tKIWwldv9/HZGdGvJE939oESfmQXeQFTUyKrC1DjWX6Fu oxexA8JZdj2lc8SQojtC9/wbvLsFBw0= X-Google-Smtp-Source: ABdhPJzBScG/wWniuJq1ZxzlvAdm+W97pN3NyYk0W/Mv0pfHLAseMttry4p2jrdgX7rKKZGeMP5I4Q== X-Received: by 2002:a05:6512:2146:: with SMTP id s6mr1978988lfr.492.1602879872231; Fri, 16 Oct 2020 13:24:32 -0700 (PDT) Received: from home.paul.comp (paulfertser.info. [2001:470:26:54b:226:9eff:fe70:80c2]) by smtp.gmail.com with ESMTPSA id h11sm1211025ljc.21.2020.10.16.13.24.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 16 Oct 2020 13:24:31 -0700 (PDT) Received: from home.paul.comp (home.paul.comp [IPv6:0:0:0:0:0:0:0:1]) by home.paul.comp (8.15.2/8.15.2/Debian-14~deb10u1) with ESMTP id 09GKOSWF009619; Fri, 16 Oct 2020 23:24:29 +0300 Received: (from paul@localhost) by home.paul.comp (8.15.2/8.15.2/Submit) id 09GKOSkq009618; Fri, 16 Oct 2020 23:24:28 +0300 From: Paul Fertser To: openwrt-devel@lists.openwrt.org Subject: [PATCH] mac80211: fix MAC address allocations when local bit set on base addr Date: Fri, 16 Oct 2020 23:24:19 +0300 Message-Id: <20201016202419.9578-1-fercerpav@gmail.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20201016_162435_748667_02A5239F X-CRM114-Status: GOOD ( 13.11 ) X-Spam-Score: -0.2 (/) X-Spam-Report: SpamAssassin version 3.4.4 on merlin.infradead.org summary: Content analysis details: (-0.2 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:144 listed in] [list.dnswl.org] 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [fercerpav[at]gmail.com] -0.0 SPF_PASS SPF: sender matches SPF record -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Paul Fertser Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org Testing with hwsim reveals two problems: 1. phyX/addresses has two addresses and mac80211_get_addr keeps returning the last one when asked for more; 2. The base address has the local bit set and the operation unsets it. Fix both. Fixes: 866790fd827cb0187353cdf484eb46a9b38fb6ba Reported-by: Zero_Chaos Signed-off-by: Paul Fertser --- package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh index 823c68170a..3097a053b8 100644 --- a/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh +++ b/package/kernel/mac80211/files/lib/netifd/wireless/mac80211.sh @@ -383,7 +383,7 @@ mac80211_generate_mac() { [ "$mask" = "00:00:00:00:00:00" ] && { mask="ff:ff:ff:ff:ff:ff"; - [ "$(wc -l < /sys/class/ieee80211/${phy}/addresses)" -gt 1 ] && { + [ "$(wc -l < /sys/class/ieee80211/${phy}/addresses)" -gt $id ] && { addr="$(mac80211_get_addr "$phy" "$id")" [ -n "$addr" ] && { echo "$addr" @@ -403,7 +403,7 @@ mac80211_generate_mac() { [ "$((0x$mask1))" -gt 0 ] && { b1="0x$1" [ "$id" -gt 0 ] && \ - b1=$(($b1 ^ ((($id - !($b1 & 2)) << 2) | 0x2))) + b1=$(($b1 ^ ((($id - !($b1 & 2)) << 2)) | 0x2)) printf "%02x:%s:%s:%s:%s:%s" $b1 $2 $3 $4 $5 $6 return }