From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-alma10-1.taild15c8.ts.net [100.103.45.18]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 0D72F34B1A6; Tue, 21 Jul 2026 21:47:00 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=100.103.45.18 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784670422; cv=none; b=Lt63OUwasm94e7KTznR8+AiGs2tixLk7AsZM65rO/exT/mUu4CvLAe74p09HuAP10jWNsPoxPuzyGwuo7dvXsgj7X1deH+WyOyA3lOGeOUS8rgvzH77jl0tZci123DpomzKuFgj4MTUlL/VQKmzUXlt6UqIko2zt5LtibGvzxUU= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1784670422; c=relaxed/simple; bh=AEoyiWH96TdJ+scrxIYc52dadat7pZIdQCzYwdpMnik=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=GENhIRkjNPE4dJXQiIOJx9d+LJpOO5JlQQMtMzl4pNZgN7X2OREwEDA4dadbv7mog29pJW5ShnyTNC1WQWxSTrSqwGBHuk8Zc3Pm8UZvG1UXJf36QYaWcYcvbg70uVTR8k7PoV2LxK2mB/3iLdzA5SsL9klrj6jXoRSBCJYXIQM= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=cptgn0em; arc=none smtp.client-ip=100.103.45.18 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="cptgn0em" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2533E1F000E9; Tue, 21 Jul 2026 21:46:59 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1784670420; bh=FRulexm+jjQebOCwjo8pFST81QRB3NGtg7nG90vvNHA=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=cptgn0emyLM3sjSarWfriql8fLJrqchmsVE5Df0/dX1N+mCduMPj7xUo1L6FaG+ak cBoZHqHQLC8LAM8Cn5G9v5gHPdpEEkw5PVQJYJqr3ufL6i/y3God3kZKFIyH+e3y5j ZB1C4vAdJMyk87W6NXgOqbguN4eQJnrt3z9+xM5c= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, James Raphael Tiovalen , Sabrina Dubroca , Paolo Abeni Subject: [PATCH 6.1 0924/1067] macsec: fix promiscuity refcount leak in macsec_dev_open() Date: Tue, 21 Jul 2026 17:25:25 +0200 Message-ID: <20260721152445.204605205@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260721152424.521567757@linuxfoundation.org> References: <20260721152424.521567757@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: James Raphael Tiovalen commit 7410d11460eb90d6c9281162ccc6a128534d897d upstream. When a MACsec interface with IFF_PROMISC set is brought up on top of a device that has hardware offload enabled, macsec_dev_open() first calls dev_set_promiscuity(real_dev, 1) and then propagates the open to the offload device. If that propagation fails, the error path jumps to the clear_allmulti label, which only reverts allmulti and the unicast address. The promiscuity taken on the lower device is never dropped, so real_dev is left permanently stuck in promiscuous mode. Its promiscuity count can no longer be balanced from software. Add a clear_promisc label that drops the promiscuity reference and route the two offload failure paths to it. The dev_set_promiscuity() failure itself still jumps to clear_allmulti, since on that failure the count was not incremented. Fixes: 3cf3227a21d1 ("net: macsec: hardware offloading infrastructure") Cc: stable@vger.kernel.org Signed-off-by: James Raphael Tiovalen Reviewed-by: Sabrina Dubroca Link: https://patch.msgid.link/20260705113629.187490-1-jamestiotio@gmail.com Signed-off-by: Paolo Abeni Signed-off-by: Greg Kroah-Hartman --- drivers/net/macsec.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) --- a/drivers/net/macsec.c +++ b/drivers/net/macsec.c @@ -3569,19 +3569,22 @@ static int macsec_dev_open(struct net_de ops = macsec_get_ops(netdev_priv(dev), &ctx); if (!ops) { err = -EOPNOTSUPP; - goto clear_allmulti; + goto clear_promisc; } ctx.secy = &macsec->secy; err = macsec_offload(ops->mdo_dev_open, &ctx); if (err) - goto clear_allmulti; + goto clear_promisc; } if (netif_carrier_ok(real_dev)) netif_carrier_on(dev); return 0; +clear_promisc: + if (dev->flags & IFF_PROMISC) + dev_set_promiscuity(real_dev, -1); clear_allmulti: if (dev->flags & IFF_ALLMULTI) dev_set_allmulti(real_dev, -1);