From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Moshe Shemesh <moshe@nvidia.com>, Jiri Pirko <jiri@nvidia.com>,
Jakub Kicinski <kuba@kernel.org>, Sasha Levin <sashal@kernel.org>,
davem@davemloft.net, edumazet@google.com, pabeni@redhat.com,
idosch@nvidia.com, jacob.e.keller@intel.com,
michal.wilczynski@intel.com, vikas.gupta@broadcom.com,
shayd@nvidia.com, netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 6.1 47/49] devlink: health: Fix nla_nest_end in error flow
Date: Sun, 26 Feb 2023 09:46:47 -0500 [thread overview]
Message-ID: <20230226144650.826470-47-sashal@kernel.org> (raw)
In-Reply-To: <20230226144650.826470-1-sashal@kernel.org>
From: Moshe Shemesh <moshe@nvidia.com>
[ Upstream commit bfd4e6a5dbbc12f77620602e764ac940ccb159de ]
devlink_nl_health_reporter_fill() error flow calls nla_nest_end(). Fix
it to call nla_nest_cancel() instead.
Note the bug is harmless as genlmsg_cancel() cancel the entire message,
so no fixes tag added.
Signed-off-by: Moshe Shemesh <moshe@nvidia.com>
Reviewed-by: Jiri Pirko <jiri@nvidia.com>
Reviewed-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
net/core/devlink.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/net/core/devlink.c b/net/core/devlink.c
index 2aa77d4b80d0a..8f0c084e4135d 100644
--- a/net/core/devlink.c
+++ b/net/core/devlink.c
@@ -7628,7 +7628,7 @@ devlink_nl_health_reporter_fill(struct sk_buff *msg,
return 0;
reporter_nest_cancel:
- nla_nest_end(msg, reporter_attr);
+ nla_nest_cancel(msg, reporter_attr);
genlmsg_cancel:
genlmsg_cancel(msg, hdr);
return -EMSGSIZE;
--
2.39.0
next prev parent reply other threads:[~2023-02-26 14:56 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-02-26 14:46 [PATCH AUTOSEL 6.1 01/49] wifi: ath9k: Fix use-after-free in ath9k_hif_usb_disconnect() Sasha Levin
2023-02-26 14:46 ` [PATCH AUTOSEL 6.1 02/49] wifi: ath11k: fix monitor mode bringup crash Sasha Levin
2023-02-26 14:46 ` [PATCH AUTOSEL 6.1 03/49] wifi: brcmfmac: Fix potential stack-out-of-bounds in brcmf_c_preinit_dcmds() Sasha Levin
2023-02-26 14:46 ` [PATCH AUTOSEL 6.1 09/49] wifi: ath11k: debugfs: fix to work with multiple PCI devices Sasha Levin
2023-02-26 14:46 ` [PATCH AUTOSEL 6.1 14/49] wifi: brcmfmac: ensure CLM version is null-terminated to prevent stack-out-of-bounds Sasha Levin
2023-02-26 14:46 ` [PATCH AUTOSEL 6.1 15/49] wifi: mt7601u: fix an integer underflow Sasha Levin
2023-02-26 14:46 ` [PATCH AUTOSEL 6.1 16/49] inet: fix fast path in __inet_hash_connect() Sasha Levin
2023-02-26 14:46 ` [PATCH AUTOSEL 6.1 17/49] ice: restrict PTP HW clock freq adjustments to 100, 000, 000 PPB Sasha Levin
2023-02-26 14:46 ` [PATCH AUTOSEL 6.1 18/49] ice: add missing checks for PF vsi type Sasha Levin
2023-02-26 14:46 ` [PATCH AUTOSEL 6.1 24/49] netpoll: Remove 4s sleep during carrier detection Sasha Levin
2023-02-26 14:46 ` [PATCH AUTOSEL 6.1 25/49] net: bcmgenet: Add a check for oversized packets Sasha Levin
2023-02-26 14:46 ` [PATCH AUTOSEL 6.1 28/49] netfilter: nf_tables: NULL pointer dereference in nf_tables_updobj() Sasha Levin
2023-02-26 14:46 ` [PATCH AUTOSEL 6.1 29/49] can: isotp: check CAN address family in isotp_bind() Sasha Levin
2023-02-26 14:46 ` [PATCH AUTOSEL 6.1 32/49] wifi: mt76: dma: free rx_head in mt76_dma_rx_cleanup Sasha Levin
2023-02-26 14:46 ` [PATCH AUTOSEL 6.1 34/49] net/mlx5: fw_tracer: Fix debug print Sasha Levin
2023-02-26 14:46 ` [PATCH AUTOSEL 6.1 44/49] wifi: rtw89: debug: avoid invalid access on RTW89_DBG_SEL_MAC_30 Sasha Levin
2023-02-26 14:46 ` [PATCH AUTOSEL 6.1 45/49] hv_netvsc: Check status in SEND_RNDIS_PKT completion message Sasha Levin
2023-02-26 14:46 ` Sasha Levin [this message]
2023-02-26 14:46 ` [PATCH AUTOSEL 6.1 49/49] scm: add user copy checks to put_cmsg() Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230226144650.826470-47-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=idosch@nvidia.com \
--cc=jacob.e.keller@intel.com \
--cc=jiri@nvidia.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.wilczynski@intel.com \
--cc=moshe@nvidia.com \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=shayd@nvidia.com \
--cc=stable@vger.kernel.org \
--cc=vikas.gupta@broadcom.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).