From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-vs1-f98.google.com (mail-vs1-f98.google.com [209.85.217.98]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 137B93AFAEA for ; Mon, 3 Aug 2026 08:55:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.217.98 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785747304; cv=none; b=WcV60Ydxn0hqZyKlT244jhAxPUWdcNpGYefVvEURMkYHnVw6ndJomgkZfCCCyNct91PCNkhhwaTc33hVI09G8GCqpSxuvX60h+a8O7pbPkEIBOikeyDcz+wzMhRw5PnqVhA+4oydM8wTdHcZr83bKmA354cnKkBcTsMMQJcYfIE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1785747304; c=relaxed/simple; bh=AV0pToG9zNPBiZyyn1M9cI3XYMude2xTH+l+24aft2Q=; h=Message-ID:Date:MIME-Version:Subject:To:Cc:References:From: In-Reply-To:Content-Type; b=Ns3HHRh7pWuVt4r7ksxdM4l8/8FVpjkq0BuNSf09ARvqQcWjhcHiEbokOGoipAjOqOsMFsFUZiP0KHMtJ9Vaabdh/brIlSPmUxzpSVXEe/LDJ9JGxNPXLp/KWLSaQoLqHCyVU5S8CnOmbCs1Fu2OoCpPtaD1JJKR966nX430j4w= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com; spf=fail smtp.mailfrom=broadcom.com; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b=HP4JwJ9s; arc=none smtp.client-ip=209.85.217.98 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=reject dis=none) header.from=broadcom.com Authentication-Results: smtp.subspace.kernel.org; spf=fail smtp.mailfrom=broadcom.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=broadcom.com header.i=@broadcom.com header.b="HP4JwJ9s" Received: by mail-vs1-f98.google.com with SMTP id ada2fe7eead31-75738fcb0d9so495709137.0 for ; Mon, 03 Aug 2026 01:55:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20251104; t=1785747302; x=1786352102; h=content-transfer-encoding:content-type:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:dkim-signature:x-gm-gg:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to:content-type; bh=6QujGCeTnnZ3aprREzL53swawys0bVa+jOxZyTHDqDc=; b=XhHLNsmxLmqLfdHEi7dyvFZ2iaTklF1XtvTTtAMImH5QXO94x19SMsTpzEl3PPsB4R RPQE4x5hWvw5b5zXBaFnGw/fPwumcqkBs227rwQ1NtXu9SXn6NYX5IkkxD8lf6I7lXML VLZR3xWTakX+eGZCkbZgty1bfSU2tXAe75wff+olAqK7u1Da4R+ETtr62jZ55Ip1bFhh D1IYv8G4B+agOnK07x3OGZUoMCQimiRPMv+II7gtGh+8E4hrveBrc4Jc30h070ZmgqcH WC4ufwxP2pf0m5aZv+Qy43xINKi4a50+jMa7G93UhYaNBghZqwvSNHYw78hB6rENf9uM lESw== X-Forwarded-Encrypted: i=1; AHgh+Ro4CZQdy0Eido2bjLLqdgAe9+J+mDFJ4CzbNRCbN4MY0uqdyA/3mzci9qTgIxE+A1hXGjMmi1j+oJw3tdM=@vger.kernel.org X-Gm-Message-State: AOJu0YyuKlbkuMkVgs3I/00LdsdMpsDC2YfA6mK9CYMGRtM39MKCUHhH 5toOL492RudZhwFgmx6jqa5X7zal89Y0CEc6u2s1PlzcG6CO5cw0RtsR41dCYb5dTz0MoEj4gvy CaxfppkkFbtDtdEpLiUe2ezbxJBEq8FdYemWIhAWUWmXpMw0WjPb+xjBbhKYlMY7qCGrpildaAc jFhgP/8kCdLUC8IQxHsOO2HTKvPLSrPeCCrT8A+4fIsYERRAYyaTkEdfRb+3Jmpy2frRJ+GyDth MaN/Y54Vv2VhP37ZzDv1c6JZg== X-Gm-Gg: AR+sD13kzxp+qhWTI5C6w99T8vTpYM3E2U2JYPt/4ui0VFJ9vJYTvxqu+6emRU15arv 7/KSU2fR1GFzdS5TAX0KbZ4pg4vMG+3DYUsVT3qkZZWBD33jWpyXcZGvwGSu5UGpywLPjZZdWwS JZFM7QRXdbjQiaZzt63YnV4E1rh2uhuJ9WFwuJXdG34VYpqUYpA8H5E6ycU07Bwgf3XyCwvNi35 Rh5LQWBYHH0Eqb/7PNZoqEFyxJUFp8QtiTz8PwCWfqr9XxfOmTJKQDIV6uHIFNsXa8+ckRPY25C gQ6p2Tuip/2C6J7lm4iayGZOoHRezx7u3eTQDJDAIS7yUhr5m8tvn8fa14smxsUMsTBKaViG65r ZY6tq2DDDWihV0gplSA1UXwpFH6dpP6D1AEomaYHq60s0ywbmr4wfmq2vdXBffCIyXmSbEcfaWb cOuWZcN/ydDOKnkULkdgn/2lPeCPI/u61IZ7bOUUk= X-Received: by 2002:a05:6102:8095:b0:74c:9177:35bc with SMTP id ada2fe7eead31-75b2156c4e9mr5243188137.2.1785747301819; Mon, 03 Aug 2026 01:55:01 -0700 (PDT) Received: from smtp-us-east1-p01-i01-si01.dlp.protect.broadcom.com (address-144-49-247-26.dlp.protect.broadcom.com. [144.49.247.26]) by smtp-relay.gmail.com with ESMTPS id ada2fe7eead31-759b8918e3fsm790211137.5.2026.08.03.01.55.00 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Mon, 03 Aug 2026 01:55:01 -0700 (PDT) X-Relaying-Domain: broadcom.com X-CFilter-Loop: Reflected Received: by mail-qt1-f197.google.com with SMTP id d75a77b69052e-51a8b0a08d2so24137321cf.0 for ; Mon, 03 Aug 2026 01:55:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=broadcom.com; s=google; t=1785747300; x=1786352100; darn=vger.kernel.org; h=content-transfer-encoding:content-type:in-reply-to:from :content-language:references:cc:to:subject:user-agent:mime-version :date:message-id:from:to:cc:subject:date:message-id:reply-to :content-type; bh=6QujGCeTnnZ3aprREzL53swawys0bVa+jOxZyTHDqDc=; b=HP4JwJ9slPbJzazz6ZHBq5LNStXE1n/NmJCVdRqB/8vLAc/TuiZ3MZILwZDpTZimHb VvU92eWn71N59v7l1mzKqkBJzxLuNaW5aMX75nzJU70yzy3QPgZdI+DBchiG8G6j5XfH cjB5e4dHQoEWtdJRcZf1gykr0LKCckYxEszmY= X-Forwarded-Encrypted: i=1; AHgh+RrE5m+we8BhACj8LfNi0JS61OpkV7XgqqILo5ThP2eMsPH7CIGBUNf9btknocDgMLn0PDSDVRiFD6DlT/A=@vger.kernel.org X-Received: by 2002:ac8:5fcb:0:b0:51c:e14:87ae with SMTP id d75a77b69052e-52b5686a056mr179473351cf.34.1785747300362; Mon, 03 Aug 2026 01:55:00 -0700 (PDT) X-Received: by 2002:ac8:5fcb:0:b0:51c:e14:87ae with SMTP id d75a77b69052e-52b5686a056mr179473231cf.34.1785747299954; Mon, 03 Aug 2026 01:54:59 -0700 (PDT) Received: from [10.176.2.103] ([192.19.176.250]) by smtp.gmail.com with ESMTPSA id 6a1803df08f44-908434a2400sm70190036d6.18.2026.08.03.01.54.58 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Mon, 03 Aug 2026 01:54:59 -0700 (PDT) Message-ID: Date: Mon, 3 Aug 2026 10:54:59 +0200 Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH] wifi: brcmfmac: Fix memory leak in brcmf_sdio_read_control() To: Johannes Berg , Abdun Nihaal Cc: linux-wireless@vger.kernel.org, brcm80211@lists.linux.dev, brcm80211-dev-list.pdl@broadcom.com, linux-kernel@vger.kernel.org, stable@vger.kernel.org References: <20260722110713.115988-1-nihaal@cse.iitm.ac.in> <20260802083905.3819981-2-arend.vanspriel@broadcom.com> <6648c1d61a44ad732550ff20c0b1aecaa43676f6.camel@sipsolutions.net> <19fc626a040.2873.9b12b7fc0a3841636cfb5e919b41b954@broadcom.com> Content-Language: en-US From: Arend van Spriel In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-DetectorID-Processed: b00c1d49-9d2e-4205-b15f-d015386d3d5e On 03/08/2026 10:35, Johannes Berg wrote: > On Mon, 2026-08-03 at 10:21 +0200, Arend van Spriel wrote: >>> >>> I looked at moving the vfree() to the done: label, but the code also >>> gets there in the success path to wakeup waiters. In the success path >>> the buf is stored for further processing so it should not be freed. > > Hah, my bad, sorry! > >>> Maybe better to do: >>> >>>        spin_unlock_bh(&bus->rxctl_lock); >>>        brcmf_sdio_dcmd_resp_wake(bus); >>>        return; >>> >>> fail: >>>        vfree(buf); >>>        /* Awake any waiters */ >>>        brcmf_sdio_dcmd_resp_wake(bus); >>> } >> Actually it turns out brcmf_sdio_read_control() is only called once so >> the brcmf_sdio_dcmd_resp_wake() can be taken outside the function. > > Or just something like this? > > --- a/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c > +++ b/drivers/net/wireless/broadcom/brcm80211/brcmfmac/sdio.c > @@ -1827,15 +1827,17 @@ brcmf_sdio_read_control(struct brcmf_sdio *bus, u8 *hdr, uint len, uint doff) > if (bus->rxctl) { > brcmf_err("last control frame is being processed.\n"); > spin_unlock_bh(&bus->rxctl_lock); > - vfree(buf); > goto done; > } > bus->rxctl = buf + doff; > bus->rxctl_orig = buf; > bus->rxlen = len - doff; > spin_unlock_bh(&bus->rxctl_lock); > + /* buffer is queued */ > + buf = NULL; > > done: > + vfree(buf); > /* Awake any waiters */ > brcmf_sdio_dcmd_resp_wake(bus); > } > > > It's already using vmalloc() so seems it wouldn't care that much about > calling vfree(NULL) on the success path? True. And yes, the existing vfree() should go, but I figured that goes without saying so I did not mention that. I am fine with your proposal, but I guess the author will have to submit a v2 patch, right? Gr. AvS