From: Andrea Parri <parri.andrea@gmail.com>
To: Sasha Levin <sashal@kernel.org>
Cc: linux-kernel@vger.kernel.org, stable@vger.kernel.org,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
"Martin K. Petersen" <martin.petersen@oracle.com>,
linux-scsi@vger.kernel.org,
Saruhan Karademir <skarade@microsoft.com>,
devel@linuxdriverproject.org
Subject: Re: [PATCH AUTOSEL 5.9 15/23] scsi: storvsc: Validate length of incoming packet in storvsc_on_channel_callback()
Date: Sat, 12 Dec 2020 19:09:01 +0100 [thread overview]
Message-ID: <20201212180901.GA19225@andrea> (raw)
In-Reply-To: <20201212160804.2334982-15-sashal@kernel.org>
Hi Sasha,
On Sat, Dec 12, 2020 at 11:07:56AM -0500, Sasha Levin wrote:
> From: "Andrea Parri (Microsoft)" <parri.andrea@gmail.com>
>
> [ Upstream commit 3b8c72d076c42bf27284cda7b2b2b522810686f8 ]
FYI, we found that this commit introduced a regression and posted a
revert:
https://lkml.kernel.org/r/20201211131404.21359-1-parri.andrea@gmail.com
Same comment for the AUTOSEL 5.4, 4.19 and 4.14 you've just posted.
Andrea
>
> Check that the packet is of the expected size at least, don't copy data
> past the packet.
>
> Link: https://lore.kernel.org/r/20201118145348.109879-1-parri.andrea@gmail.com
> Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
> Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
> Cc: linux-scsi@vger.kernel.org
> Reported-by: Saruhan Karademir <skarade@microsoft.com>
> Signed-off-by: Andrea Parri (Microsoft) <parri.andrea@gmail.com>
> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
> Signed-off-by: Sasha Levin <sashal@kernel.org>
> ---
> drivers/scsi/storvsc_drv.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
> index 8f5f5dc863a4a..6779ee4edfee3 100644
> --- a/drivers/scsi/storvsc_drv.c
> +++ b/drivers/scsi/storvsc_drv.c
> @@ -1246,6 +1246,11 @@ static void storvsc_on_channel_callback(void *context)
> request = (struct storvsc_cmd_request *)
> ((unsigned long)desc->trans_id);
>
> + if (hv_pkt_datalen(desc) < sizeof(struct vstor_packet) - vmscsi_size_delta) {
> + dev_err(&device->device, "Invalid packet len\n");
> + continue;
> + }
> +
> if (request == &stor_device->init_request ||
> request == &stor_device->reset_request) {
> memcpy(&request->vstor_packet, packet,
> --
> 2.27.0
>
WARNING: multiple messages have this Message-ID (diff)
From: Andrea Parri <parri.andrea@gmail.com>
To: Sasha Levin <sashal@kernel.org>
Cc: "Martin K. Petersen" <martin.petersen@oracle.com>,
linux-scsi@vger.kernel.org,
"James E.J. Bottomley" <jejb@linux.ibm.com>,
linux-kernel@vger.kernel.org, stable@vger.kernel.org,
devel@linuxdriverproject.org,
Saruhan Karademir <skarade@microsoft.com>
Subject: Re: [PATCH AUTOSEL 5.9 15/23] scsi: storvsc: Validate length of incoming packet in storvsc_on_channel_callback()
Date: Sat, 12 Dec 2020 19:09:01 +0100 [thread overview]
Message-ID: <20201212180901.GA19225@andrea> (raw)
In-Reply-To: <20201212160804.2334982-15-sashal@kernel.org>
Hi Sasha,
On Sat, Dec 12, 2020 at 11:07:56AM -0500, Sasha Levin wrote:
> From: "Andrea Parri (Microsoft)" <parri.andrea@gmail.com>
>
> [ Upstream commit 3b8c72d076c42bf27284cda7b2b2b522810686f8 ]
FYI, we found that this commit introduced a regression and posted a
revert:
https://lkml.kernel.org/r/20201211131404.21359-1-parri.andrea@gmail.com
Same comment for the AUTOSEL 5.4, 4.19 and 4.14 you've just posted.
Andrea
>
> Check that the packet is of the expected size at least, don't copy data
> past the packet.
>
> Link: https://lore.kernel.org/r/20201118145348.109879-1-parri.andrea@gmail.com
> Cc: "James E.J. Bottomley" <jejb@linux.ibm.com>
> Cc: "Martin K. Petersen" <martin.petersen@oracle.com>
> Cc: linux-scsi@vger.kernel.org
> Reported-by: Saruhan Karademir <skarade@microsoft.com>
> Signed-off-by: Andrea Parri (Microsoft) <parri.andrea@gmail.com>
> Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
> Signed-off-by: Sasha Levin <sashal@kernel.org>
> ---
> drivers/scsi/storvsc_drv.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/drivers/scsi/storvsc_drv.c b/drivers/scsi/storvsc_drv.c
> index 8f5f5dc863a4a..6779ee4edfee3 100644
> --- a/drivers/scsi/storvsc_drv.c
> +++ b/drivers/scsi/storvsc_drv.c
> @@ -1246,6 +1246,11 @@ static void storvsc_on_channel_callback(void *context)
> request = (struct storvsc_cmd_request *)
> ((unsigned long)desc->trans_id);
>
> + if (hv_pkt_datalen(desc) < sizeof(struct vstor_packet) - vmscsi_size_delta) {
> + dev_err(&device->device, "Invalid packet len\n");
> + continue;
> + }
> +
> if (request == &stor_device->init_request ||
> request == &stor_device->reset_request) {
> memcpy(&request->vstor_packet, packet,
> --
> 2.27.0
>
_______________________________________________
devel mailing list
devel@linuxdriverproject.org
http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel
next prev parent reply other threads:[~2020-12-12 18:09 UTC|newest]
Thread overview: 44+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-12 16:07 [PATCH AUTOSEL 5.9 01/23] drm/tegra: sor: Don't warn on probe deferral Sasha Levin
2020-12-12 16:07 ` Sasha Levin
2020-12-12 16:07 ` [PATCH AUTOSEL 5.9 02/23] drm/tegra: sor: Ensure regulators are disabled on teardown Sasha Levin
2020-12-12 16:07 ` Sasha Levin
2020-12-12 16:07 ` [PATCH AUTOSEL 5.9 03/23] drm/tegra: replace idr_init() by idr_init_base() Sasha Levin
2020-12-12 16:07 ` Sasha Levin
2020-12-12 16:07 ` [PATCH AUTOSEL 5.9 04/23] dm integrity: don't use drivers that have CRYPTO_ALG_ALLOCATES_MEMORY Sasha Levin
2020-12-12 16:07 ` [dm-devel] " Sasha Levin
2020-12-12 16:07 ` [PATCH AUTOSEL 5.9 05/23] gfs2: set lockdep subclass for iopen glocks Sasha Levin
2020-12-12 16:07 ` [Cluster-devel] " Sasha Levin
2020-12-12 16:07 ` [PATCH AUTOSEL 5.9 06/23] ASoC: rt5682: change SAR voltage threshold Sasha Levin
2020-12-12 16:07 ` Sasha Levin
2020-12-12 16:07 ` [PATCH AUTOSEL 5.9 07/23] kernel/cpu: add arch override for clear_tasks_mm_cpumask() mm handling Sasha Levin
2020-12-12 16:07 ` [PATCH AUTOSEL 5.9 08/23] drm/tegra: sor: Disable clocks on error in tegra_sor_init() Sasha Levin
2020-12-12 16:07 ` Sasha Levin
2020-12-12 16:07 ` [PATCH AUTOSEL 5.9 09/23] selftests: tc-testing: enable CONFIG_NET_SCH_RED as a module Sasha Levin
2020-12-12 16:07 ` [PATCH AUTOSEL 5.9 10/23] habanalabs: free host huge va_range if not used Sasha Levin
2020-12-12 16:07 ` [PATCH AUTOSEL 5.9 11/23] habanalabs: put devices before driver removal Sasha Levin
2020-12-12 16:07 ` [PATCH AUTOSEL 5.9 12/23] arm64: syscall: exit userspace before unmasking exceptions Sasha Levin
2020-12-12 16:07 ` Sasha Levin
2020-12-12 16:07 ` [PATCH AUTOSEL 5.9 13/23] vxlan: Add needed_headroom for lower device Sasha Levin
2020-12-12 16:07 ` [PATCH AUTOSEL 5.9 14/23] vxlan: Copy needed_tailroom from lowerdev Sasha Levin
2020-12-12 16:07 ` [PATCH AUTOSEL 5.9 15/23] scsi: storvsc: Validate length of incoming packet in storvsc_on_channel_callback() Sasha Levin
2020-12-12 16:07 ` Sasha Levin
2020-12-12 18:09 ` Andrea Parri [this message]
2020-12-12 18:09 ` Andrea Parri
2020-12-13 14:05 ` Sasha Levin
2020-12-13 14:05 ` Sasha Levin
2020-12-14 11:07 ` Dan Carpenter
2020-12-14 11:07 ` Dan Carpenter
2020-12-14 13:06 ` Konstantin Ryabitsev
2020-12-14 13:06 ` Konstantin Ryabitsev
2020-12-14 18:29 ` Sasha Levin
2020-12-14 18:29 ` Sasha Levin
2020-12-12 16:07 ` [PATCH AUTOSEL 5.9 16/23] scsi: mpt3sas: Increase IOCInit request timeout to 30s Sasha Levin
2020-12-12 16:07 ` [PATCH AUTOSEL 5.9 17/23] dm table: Remove BUG_ON(in_interrupt()) Sasha Levin
2020-12-12 16:07 ` [dm-devel] " Sasha Levin
2020-12-12 16:07 ` [PATCH AUTOSEL 5.9 18/23] iwlwifi: pcie: add one missing entry for AX210 Sasha Levin
2020-12-12 16:08 ` [PATCH AUTOSEL 5.9 19/23] iwlwifi: pcie: add some missing entries " Sasha Levin
2020-12-12 16:08 ` [PATCH AUTOSEL 5.9 20/23] drm/amd/display: Init clock value by current vbios CLKs Sasha Levin
2020-12-12 16:08 ` Sasha Levin
2020-12-12 16:08 ` [PATCH AUTOSEL 5.9 21/23] perf/x86/intel: Check PEBS status correctly Sasha Levin
2020-12-12 16:08 ` [PATCH AUTOSEL 5.9 22/23] kbuild: avoid split lines in .mod files Sasha Levin
2020-12-12 16:08 ` [PATCH AUTOSEL 5.9 23/23] tools/testing/selftests/vm: fix build error 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=20201212180901.GA19225@andrea \
--to=parri.andrea@gmail.com \
--cc=devel@linuxdriverproject.org \
--cc=jejb@linux.ibm.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-scsi@vger.kernel.org \
--cc=martin.petersen@oracle.com \
--cc=sashal@kernel.org \
--cc=skarade@microsoft.com \
--cc=stable@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.