linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Phillip Potter <phil@philpotter.co.uk>,
	syzbot+e267bed19bfc5478fb33@syzkaller.appspotmail.com,
	"David S . Miller" <davem@davemloft.net>,
	Sasha Levin <sashal@kernel.org>,
	netdev@vger.kernel.org
Subject: [PATCH AUTOSEL 5.12 29/37] net: hsr: check skb can contain struct hsr_ethhdr in fill_frame_info
Date: Wed, 12 May 2021 14:00:56 -0400	[thread overview]
Message-ID: <20210512180104.664121-29-sashal@kernel.org> (raw)
In-Reply-To: <20210512180104.664121-1-sashal@kernel.org>

From: Phillip Potter <phil@philpotter.co.uk>

[ Upstream commit 2e9f60932a2c19e8a11b4a69d419f107024b05a0 ]

Check at start of fill_frame_info that the MAC header in the supplied
skb is large enough to fit a struct hsr_ethhdr, as otherwise this is
not a valid HSR frame. If it is too small, return an error which will
then cause the callers to clean up the skb. Fixes a KMSAN-found
uninit-value bug reported by syzbot at:
https://syzkaller.appspot.com/bug?id=f7e9b601f1414f814f7602a82b6619a8d80bce3f

Reported-by: syzbot+e267bed19bfc5478fb33@syzkaller.appspotmail.com
Signed-off-by: Phillip Potter <phil@philpotter.co.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 net/hsr/hsr_forward.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/net/hsr/hsr_forward.c b/net/hsr/hsr_forward.c
index b218e4594009..6852e9bccf5b 100644
--- a/net/hsr/hsr_forward.c
+++ b/net/hsr/hsr_forward.c
@@ -520,6 +520,10 @@ static int fill_frame_info(struct hsr_frame_info *frame,
 	struct ethhdr *ethhdr;
 	__be16 proto;
 
+	/* Check if skb contains hsr_ethhdr */
+	if (skb->mac_len < sizeof(struct hsr_ethhdr))
+		return -EINVAL;
+
 	memset(frame, 0, sizeof(*frame));
 	frame->is_supervision = is_supervision_frame(port->hsr, skb);
 	frame->node_src = hsr_get_node(port, &hsr->node_db, skb,
-- 
2.30.2


  parent reply	other threads:[~2021-05-12 19:45 UTC|newest]

Thread overview: 37+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-05-12 18:00 [PATCH AUTOSEL 5.12 01/37] ARM: 9058/1: cache-v7: refactor v7_invalidate_l1 to avoid clobbering r5/r6 Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 02/37] PCI: thunder: Fix compile testing Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 03/37] dmaengine: dw-edma: Fix crash on loading/unloading driver Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 04/37] ARM: 9066/1: ftrace: pause/unpause function graph tracer in cpu_suspend() Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 05/37] f2fs: fix to avoid out-of-bounds memory access Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 06/37] NFS: Fix fscache invalidation in nfs_set_cache_invalid() Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 07/37] ACPI / hotplug / PCI: Fix reference count leak in enable_slot() Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 08/37] PCI: tegra: Fix runtime PM imbalance in pex_ep_event_pex_rst_deassert() Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 09/37] Input: elants_i2c - do not bind to i2c-hid compatible ACPI instantiated devices Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 10/37] Input: silead - add workaround for x86 BIOS-es which bring the chip up in a stuck state Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 11/37] NFS: NFS_INO_REVAL_PAGECACHE should mark the change attribute invalid Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 12/37] f2fs: fix to avoid NULL pointer dereference Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 13/37] svcrdma: Don't leak send_ctxt on Send errors Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 14/37] um: Mark all kernel symbols as local Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 15/37] um: Disable CONFIG_GCOV with MODULES Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 16/37] PCI: tegra: Add Tegra194 MCFG quirks for ECAM errata Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 17/37] ARM: 9075/1: kernel: Fix interrupted SMC calls Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 18/37] platform/chrome: cros_ec_typec: Add DP mode check Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 19/37] riscv: Use $(LD) instead of $(CC) to link vDSO Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 20/37] scripts/recordmcount.pl: Fix RISC-V regex for clang Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 21/37] riscv: Workaround mcount name prior to clang-13 Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 22/37] scsi: lpfc: Fix illegal memory access on Abort IOCBs Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 23/37] ceph: fix fscache invalidation Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 24/37] ceph: don't clobber i_snap_caps on non-I_NEW inode Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 25/37] ceph: don't allow access to MDS-private inodes Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 26/37] scsi: target: tcmu: Return from tcmu_handle_completions() if cmd_id not found Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 27/37] amdgpu/pm: Prevent force of DCEFCLK on NAVI10 and SIENNA_CICHLID Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 28/37] bridge: Fix possible races between assigning rx_handler_data and setting IFF_BRIDGE_PORT bit Sasha Levin
2021-05-12 18:00 ` Sasha Levin [this message]
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 30/37] nvmet: remove unsupported command noise Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 31/37] drm/amd/display: Fix two cursor duplication when using overlay Sasha Levin
2021-05-12 18:00 ` [PATCH AUTOSEL 5.12 32/37] gpiolib: acpi: Add quirk to ignore EC wakeups on Dell Venue 10 Pro 5055 Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.12 33/37] net:CXGB4: fix leak if sk_buff is not used Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.12 34/37] ALSA: hda: generic: change the DAC ctl name for LO+SPK or LO+HP Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.12 35/37] block: reexpand iov_iter after read/write Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.12 36/37] lib: stackdepot: turn depot_lock spinlock to raw_spinlock Sasha Levin
2021-05-12 18:01 ` [PATCH AUTOSEL 5.12 37/37] net: stmmac: Do not enable RX FIFO overflow interrupts 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=20210512180104.664121-29-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=davem@davemloft.net \
    --cc=linux-kernel@vger.kernel.org \
    --cc=netdev@vger.kernel.org \
    --cc=phil@philpotter.co.uk \
    --cc=stable@vger.kernel.org \
    --cc=syzbot+e267bed19bfc5478fb33@syzkaller.appspotmail.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).