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 93384374A16; Wed, 30 Sep 2026 16:43:08 +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=1790786589; cv=none; b=hphuzHjW3bw7fMj7kGv4On2t6d5gGLPx6cS6Mkl+tHZBAChsoJYdmshUO896uuOlpRNyS/FjojE3BPgcDeJ9xIa8bb40W81BLfN6RJ95GDKiBSq31vyUfGdG52uaFJ18fQRJLCTah2qy4d86uI+0u9szNO6aiSUCbXyM4eT04vc= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1790786589; c=relaxed/simple; bh=VSWBnEgvBpKK1Pk0SH1y/m9NtNAjw6FyY214MsBVzOc=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=RdrXj33lQRGp9prRoaN/xHuRfm2jMtxrCJnHkUYr4eCm8pkfvwt6fe0CvDfWGL3b/EGRHM5xHaNFZKfHRTxMSq87qlIUMK7rOcNiQxndwhAVE3kxWvtulPKkbU31/fUTlK9zukgWZwPiYSVHf7pofuhzIOprGx/QvBvVI+z4AIU= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=rBB474CT; 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="rBB474CT" Received: by smtp.kernel.org (Postfix) with ESMTPSA id ECF111F000FF; Wed, 30 Sep 2026 16:43:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1790786588; bh=mgukTSFkMQGac9/b/8FdX4pzRUMPQjHTnOHwRJgycbw=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=rBB474CTBLblP1+sZi3PsIA3UigeEMPQ2Ezamw+GKB5/7Hnqx/Up8aFKelhvcLhLy PUC0Zbnrz4k810MpoegVJadwitRjbvFEMoK3hw4aZsq8SLKdX5B/olWareKY6cRDMi JRl0Uay7yJV88Xx6yRrWDzsDwGwXKF+Dg9lVppcA= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jamal Hadi Salim , Jiri Pirko , Eric Dumazet , Jakub Kicinski , Sasha Levin Subject: [PATCH 6.1 914/982] net/sched: sch_teql: fix shadowed err in __teql_resolve() Date: Wed, 30 Sep 2026 17:27:30 +0200 Message-ID: <20260930152436.373172391@linuxfoundation.org> X-Mailer: git-send-email 2.55.0 In-Reply-To: <20260930152416.775402466@linuxfoundation.org> References: <20260930152416.775402466@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: Eric Dumazet [ Upstream commit 907b978e82cb4c1c245fc2985bb27c5d5c88c8f6 ] __teql_resolve() declares an inner 'int err;' inside the 'if (neigh_event_send(n, skb_res) == 0)' block, shadowing the outer 'int err = 0;'. As a result, a negative return from dev_hard_header() is written to the inner variable and __teql_resolve() still returns 0. Remove the shadowed variable and set the outer err to -EINVAL when dev_hard_header() returns a negative error. Fixes: 1da177e4c3f4 ("Linux-2.6.12-rc2") Closes: https://lore.kernel.org/netdev/179022851638.2160803.1808206741379444999@kernel.org/ Cc: Jamal Hadi Salim Cc: Jiri Pirko Signed-off-by: Eric Dumazet Link: https://patch.msgid.link/20260924082951.1599377-4-edumazet@google.com Signed-off-by: Jakub Kicinski Signed-off-by: Sasha Levin --- net/sched/sch_teql.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/net/sched/sch_teql.c b/net/sched/sch_teql.c index ace524afdcf5c..a308d42c69f65 100644 --- a/net/sched/sch_teql.c +++ b/net/sched/sch_teql.c @@ -265,14 +265,11 @@ __teql_resolve(struct sk_buff *skb, struct sk_buff *skb_res, } if (neigh_event_send(n, skb_res) == 0) { - int err; char haddr[MAX_ADDR_LEN]; neigh_ha_snapshot(haddr, n, dev); - err = dev_hard_header(skb, dev, ntohs(skb_protocol(skb, false)), - haddr, NULL, skb->len); - - if (err < 0) + if (dev_hard_header(skb, dev, ntohs(skb_protocol(skb, false)), + haddr, NULL, skb->len) < 0) err = -EINVAL; } else { err = (skb_res == NULL) ? -EAGAIN : 1; -- 2.53.0