From: Hans de Goede <hdegoede@redhat.com>
To: Dan Carpenter <dan.carpenter@oracle.com>,
Maximilian Luz <luzmaximilian@gmail.com>
Cc: Mark Gross <mgross@linux.intel.com>,
platform-driver-x86@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] platform/surface: aggregator: prevent information leak in ssam_cdev_request()
Date: Wed, 13 Jan 2021 09:29:24 +0000 [thread overview]
Message-ID: <de261fcb-7362-3c03-eecd-292e0a0038a5@redhat.com> (raw)
In-Reply-To: <X/6sVaewHLPzv00U@mwanda>
Hi,
On 1/13/21 9:16 AM, Dan Carpenter wrote:
> If copy_struct_from_user() fails at the start of the function then this
> function calls put_user(rsp.length, &r->response.length) before
> "rsp.length" is set to zero. That is a potential security issue because
> it discloses kernel stack data to user space.
>
> Fixes: 178f6ab77e61 ("platform/surface: Add Surface Aggregator user-space interface")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Thank you for your patch, another fix for this was already submitted:
https://patchwork.kernel.org/project/platform-driver-x86/patch/20210111154851.325404-2-luzmaximilian@gmail.com/
So I'm dropping this patch from my queue.
Regards,
Hans
> ---
> drivers/platform/surface/surface_aggregator_cdev.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/platform/surface/surface_aggregator_cdev.c b/drivers/platform/surface/surface_aggregator_cdev.c
> index 340d15b148b9..05e9eb118d76 100644
> --- a/drivers/platform/surface/surface_aggregator_cdev.c
> +++ b/drivers/platform/surface/surface_aggregator_cdev.c
> @@ -67,7 +67,7 @@ static long ssam_cdev_request(struct ssam_cdev *cdev, unsigned long arg)
> struct ssam_cdev_request __user *r;
> struct ssam_cdev_request rqst;
> struct ssam_request spec;
> - struct ssam_response rsp;
> + struct ssam_response rsp = {};
> const void __user *plddata;
> void __user *rspdata;
> int status = 0, ret = 0, tmp;
> @@ -96,8 +96,6 @@ static long ssam_cdev_request(struct ssam_cdev *cdev, unsigned long arg)
> spec.flags |= SSAM_REQUEST_UNSEQUENCED;
>
> rsp.capacity = rqst.response.length;
> - rsp.length = 0;
> - rsp.pointer = NULL;
>
> /* Get request payload from user-space. */
> if (spec.length) {
>
WARNING: multiple messages have this Message-ID (diff)
From: Hans de Goede <hdegoede@redhat.com>
To: Dan Carpenter <dan.carpenter@oracle.com>,
Maximilian Luz <luzmaximilian@gmail.com>
Cc: Mark Gross <mgross@linux.intel.com>,
platform-driver-x86@vger.kernel.org,
kernel-janitors@vger.kernel.org
Subject: Re: [PATCH] platform/surface: aggregator: prevent information leak in ssam_cdev_request()
Date: Wed, 13 Jan 2021 10:29:24 +0100 [thread overview]
Message-ID: <de261fcb-7362-3c03-eecd-292e0a0038a5@redhat.com> (raw)
In-Reply-To: <X/6sVaewHLPzv00U@mwanda>
Hi,
On 1/13/21 9:16 AM, Dan Carpenter wrote:
> If copy_struct_from_user() fails at the start of the function then this
> function calls put_user(rsp.length, &r->response.length) before
> "rsp.length" is set to zero. That is a potential security issue because
> it discloses kernel stack data to user space.
>
> Fixes: 178f6ab77e61 ("platform/surface: Add Surface Aggregator user-space interface")
> Signed-off-by: Dan Carpenter <dan.carpenter@oracle.com>
Thank you for your patch, another fix for this was already submitted:
https://patchwork.kernel.org/project/platform-driver-x86/patch/20210111154851.325404-2-luzmaximilian@gmail.com/
So I'm dropping this patch from my queue.
Regards,
Hans
> ---
> drivers/platform/surface/surface_aggregator_cdev.c | 4 +---
> 1 file changed, 1 insertion(+), 3 deletions(-)
>
> diff --git a/drivers/platform/surface/surface_aggregator_cdev.c b/drivers/platform/surface/surface_aggregator_cdev.c
> index 340d15b148b9..05e9eb118d76 100644
> --- a/drivers/platform/surface/surface_aggregator_cdev.c
> +++ b/drivers/platform/surface/surface_aggregator_cdev.c
> @@ -67,7 +67,7 @@ static long ssam_cdev_request(struct ssam_cdev *cdev, unsigned long arg)
> struct ssam_cdev_request __user *r;
> struct ssam_cdev_request rqst;
> struct ssam_request spec;
> - struct ssam_response rsp;
> + struct ssam_response rsp = {};
> const void __user *plddata;
> void __user *rspdata;
> int status = 0, ret = 0, tmp;
> @@ -96,8 +96,6 @@ static long ssam_cdev_request(struct ssam_cdev *cdev, unsigned long arg)
> spec.flags |= SSAM_REQUEST_UNSEQUENCED;
>
> rsp.capacity = rqst.response.length;
> - rsp.length = 0;
> - rsp.pointer = NULL;
>
> /* Get request payload from user-space. */
> if (spec.length) {
>
next prev parent reply other threads:[~2021-01-13 9:29 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-13 8:16 [PATCH] platform/surface: aggregator: prevent information leak in ssam_cdev_request() Dan Carpenter
2021-01-13 8:16 ` Dan Carpenter
2021-01-13 9:29 ` Hans de Goede [this message]
2021-01-13 9:29 ` Hans de Goede
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=de261fcb-7362-3c03-eecd-292e0a0038a5@redhat.com \
--to=hdegoede@redhat.com \
--cc=dan.carpenter@oracle.com \
--cc=kernel-janitors@vger.kernel.org \
--cc=luzmaximilian@gmail.com \
--cc=mgross@linux.intel.com \
--cc=platform-driver-x86@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.