From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Google-Smtp-Source: AIpwx4+AZFVpsV5Ec3p5yQZidaGs8klgmRtQKgIdvQ0wOiHfFyQ6CY+nKpiGdzTBBgI+4y81GHNr ARC-Seal: i=1; a=rsa-sha256; t=1522168685; cv=none; d=google.com; s=arc-20160816; b=ErCEFAclKGMmCIv1zwR6PIjFQFewoYPDq81ytcIwvOOrsJb4YWPR5xncnHjvffUF54 s8A1BbdzMRo44jaXRwE59IbFI3xq5tzLDi3UsGIMfyYSizkMVCfYbPV4Xt4bzC7EMwGv NRjPFFCkURCyAWjg+B+StCA6I6Zk1iUMLQDRD5cCQvD2+c59HyzmkNdYf1BjU0w12eYu 4vDMcYd2E+x14hq+H+E/zKuE1a6ctxmZxUBonlyJaNAWVgMaxzUgpfuMWC3cSy3lmUwW pTCEPBTR8MqbLu6ke8KJTjvz9MCm3NHtPrRZr6Ok/mvQAI6h1BrAPnhvPw6b0YKGeNTs zFNQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=mime-version:user-agent:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=hTuYEBmcIQiL5d1sdARMCcpew6bTAbZHvS0HT9zcibM=; b=Vyobnbqqo1BzLv5Dzk2+Y3LMzqYQvLkGPjkHwnF/AK6hAMB/uhnOPmU9/Ko1OcprIQ wPgSWMxw/sVfIm9FLchk0HVQMYFEPUZTV/hsml7iy43WPUq6yCXFUxkhb9XFXwkeyZTJ bGjT6uN5t6QqT/blqtnTlnWLarinlHR7KlrL3f2Y4LfjyCtmJWpOqSYQX21Na9ArOlSd RfS+So+qU667B4wq/rNQWYglw5o7QAJzpxDArIyDxIY0eH77YwzE7uleDAWltw+Hsmeb LJLE/EAIcmuNyjHyUKgPA+EzBa4YN/SbHbgI7nu+r8/qs5X+Ue2KOHPEtftr5ZsHR9Yl ahKA== ARC-Authentication-Results: i=1; mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org Authentication-Results: mx.google.com; spf=softfail (google.com: domain of transitioning gregkh@linuxfoundation.org does not designate 90.92.61.202 as permitted sender) smtp.mailfrom=gregkh@linuxfoundation.org From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Hans de Goede , Hante Meuleman , Pieter-Paul Giesberts , Franky Lin , Arend van Spriel , Kalle Valo Subject: [PATCH 4.14 062/101] brcmfmac: fix P2P_DEVICE ethernet address generation Date: Tue, 27 Mar 2018 18:27:34 +0200 Message-Id: <20180327162753.808256290@linuxfoundation.org> X-Mailer: git-send-email 2.16.3 In-Reply-To: <20180327162749.993880276@linuxfoundation.org> References: <20180327162749.993880276@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-LABELS: =?utf-8?b?IlxcU2VudCI=?= X-GMAIL-THRID: =?utf-8?q?1596109009231297608?= X-GMAIL-MSGID: =?utf-8?q?1596109551255959220?= X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 4.14-stable review patch. If anyone has any objections, please let me know. ------------------ From: Arend Van Spriel commit 455f3e76cfc0d893585a5f358b9ddbe9c1e1e53b upstream. The firmware has a requirement that the P2P_DEVICE address should be different from the address of the primary interface. When not specified by user-space, the driver generates the MAC address for the P2P_DEVICE interface using the MAC address of the primary interface and setting the locally administered bit. However, the MAC address of the primary interface may already have that bit set causing the creation of the P2P_DEVICE interface to fail with -EBUSY. Fix this by using a random address instead to determine the P2P_DEVICE address. Cc: stable@vger.kernel.org # 3.10.y Reported-by: Hans de Goede Reviewed-by: Hante Meuleman Reviewed-by: Pieter-Paul Giesberts Reviewed-by: Franky Lin Signed-off-by: Arend van Spriel Signed-off-by: Kalle Valo Signed-off-by: Greg Kroah-Hartman --- drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c | 24 +++++++---------- 1 file changed, 11 insertions(+), 13 deletions(-) --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/p2p.c @@ -462,25 +462,23 @@ static int brcmf_p2p_set_firmware(struct * @dev_addr: optional device address. * * P2P needs mac addresses for P2P device and interface. If no device - * address it specified, these are derived from the primary net device, ie. - * the permanent ethernet address of the device. + * address it specified, these are derived from a random ethernet + * address. */ static void brcmf_p2p_generate_bss_mac(struct brcmf_p2p_info *p2p, u8 *dev_addr) { - struct brcmf_if *pri_ifp = p2p->bss_idx[P2PAPI_BSSCFG_PRIMARY].vif->ifp; - bool local_admin = false; + bool random_addr = false; - if (!dev_addr || is_zero_ether_addr(dev_addr)) { - dev_addr = pri_ifp->mac_addr; - local_admin = true; - } + if (!dev_addr || is_zero_ether_addr(dev_addr)) + random_addr = true; - /* Generate the P2P Device Address. This consists of the device's - * primary MAC address with the locally administered bit set. + /* Generate the P2P Device Address obtaining a random ethernet + * address with the locally administered bit set. */ - memcpy(p2p->dev_addr, dev_addr, ETH_ALEN); - if (local_admin) - p2p->dev_addr[0] |= 0x02; + if (random_addr) + eth_random_addr(p2p->dev_addr); + else + memcpy(p2p->dev_addr, dev_addr, ETH_ALEN); /* Generate the P2P Interface Address. If the discovery and connection * BSSCFGs need to simultaneously co-exist, then this address must be