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 A7612DDC5; Thu, 28 May 2026 20:26:24 +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=1779999985; cv=none; b=KbvgDuazLmyuCV5UbSCG2AjGkPTkoC9IO/4/oWW4p8tAnkdMM7VKZtOf38B3qQ8V1rqdAstlrbTAGcboZA7k3G+0uh35A3cYI6zhVdynS0a8DpStwVvJxGNU7s1x+QpX813S+0U4yRRtXbvNOCy8JRxLXXXz8YVmrcxLk7CUI/0= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1779999985; c=relaxed/simple; bh=s5ZO53AkEMjh3bx5sP6227xdzBruydUm/27oMOssvec=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=A9LMBY8Qe/T/pii6+xC3r3G37QvwvBetUJGbiBF8gjzhN+S/zsFG6JWl7H66lGmsEyyw9ZljYigLoWkVV7weWT2uaf+VjDnkNGY6u4x+uWg+rq1lnrSkJZ9KfbmnOazQCi68op0PmVsxI/0xOhjQnucNGTilu6WrcbyW4PmsSAw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=Z6+vEEtR; 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="Z6+vEEtR" Received: by smtp.kernel.org (Postfix) with ESMTPSA id CEDD31F000E9; Thu, 28 May 2026 20:26:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linuxfoundation.org; s=korg; t=1779999984; bh=66PNjGP9sJ36OMmlKeGd62xwvpVGezP6LJSlrfH92CU=; h=From:To:Cc:Subject:Date:In-Reply-To:References; b=Z6+vEEtRLg5tXtF1p8z5EkUnCY+pLZUtlEKVBl0MbsrpFkMISuf4vCJ1SMwLmYJ7O Xzu+SjjrVXUrUlsW2Ce6okDvovubXcQi4UqEEJspT1NHSQRK57rq8F0JBXRsHCAeGg 8uvgfMivzKS+b7r0i1bwE50OQBxyHn6zy+nHmK/M= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Jakub Kicinski , Paolo Abeni , Sasha Levin Subject: [PATCH 6.18 260/377] net: shaper: set ret to -ENOMEM when genlmsg_new() fails in group_doit Date: Thu, 28 May 2026 21:48:18 +0200 Message-ID: <20260528194645.898245114@linuxfoundation.org> X-Mailer: git-send-email 2.54.0 In-Reply-To: <20260528194638.371537336@linuxfoundation.org> References: <20260528194638.371537336@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Jakub Kicinski [ Upstream commit 8054f85b83f42a37d482fc77ea7c9ff06a9407d9 ] genlmsg_new() alloc failure path in net_shaper_nl_group_doit() forgets to set ret before jumping to error handling. Fixes: 5d5d4700e75d ("net-shapers: implement NL group operation") Signed-off-by: Jakub Kicinski Link: https://patch.msgid.link/20260510192904.3987113-6-kuba@kernel.org Signed-off-by: Paolo Abeni Signed-off-by: Sasha Levin --- net/shaper/shaper.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/net/shaper/shaper.c b/net/shaper/shaper.c index ae19af13c2247..ee0d1f0613430 100644 --- a/net/shaper/shaper.c +++ b/net/shaper/shaper.c @@ -1277,8 +1277,10 @@ int net_shaper_nl_group_doit(struct sk_buff *skb, struct genl_info *info) * rollback on allocation failure. */ msg = genlmsg_new(net_shaper_handle_size(), GFP_KERNEL); - if (!msg) + if (!msg) { + ret = -ENOMEM; goto free_leaves; + } hierarchy = net_shaper_hierarchy_setup(binding); if (!hierarchy) { -- 2.53.0