From: Maximilian Luz <luzmaximilian@gmail.com>
To: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
Cc: Hans de Goede <hdegoede@redhat.com>,
Mark Gross <mgross@linux.intel.com>,
platform-driver-x86@vger.kernel.org,
linux-kernel@vger.kernel.org, kernel-test-robot <lkp@intel.com>
Subject: Re: [PATCH] platform/surface: aggregator: Fix access of unaligned value
Date: Thu, 11 Feb 2021 12:58:48 +0100 [thread overview]
Message-ID: <b68b7547-5be4-c823-d015-febb5e7f84e9@gmail.com> (raw)
In-Reply-To: <YCUFgF9gmyeO+796@smile.fi.intel.com>
On 2/11/21 11:22 AM, Andy Shevchenko wrote:
> On Thu, Feb 11, 2021 at 12:04:11AM +0100, Maximilian Luz wrote:
>> The raw message frame length is unaligned and explicitly marked as
>> little endian. It should not be accessed without the appropriatte
>> accessor functions. Fix this.
>
> Reviewed-by: Andy Shevchenko <andriy.shevchenko@linux.intel.com>
> Though a few nit-picks below.
>
>> Reported-by: kernel-test-robot <lkp@intel.com>
>> Fixes: c167b9c7e3d6 ("platform/surface: Add Surface Aggregator subsystem")
>> Signed-off-by: Maximilian Luz <luzmaximilian@gmail.com>
>> ---
>> drivers/platform/surface/aggregator/ssh_packet_layer.c | 3 ++-
>> 1 file changed, 2 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/platform/surface/aggregator/ssh_packet_layer.c b/drivers/platform/surface/aggregator/ssh_packet_layer.c
>> index 583315db8b02..9a78188d8d1c 100644
>> --- a/drivers/platform/surface/aggregator/ssh_packet_layer.c
>> +++ b/drivers/platform/surface/aggregator/ssh_packet_layer.c
>> @@ -1774,7 +1774,8 @@ static size_t ssh_ptl_rx_eval(struct ssh_ptl *ptl, struct ssam_span *source)
>> break;
>> }
>>
>> - return aligned.ptr - source->ptr + SSH_MESSAGE_LENGTH(frame->len);
>> + return aligned.ptr - source->ptr
>> + + SSH_MESSAGE_LENGTH(get_unaligned_le16(&frame->len));
>
> I would leave + on previous line.
I can fix that if it bugs you.
> Also it's possible to annotate temporary variable and use it, but it seems not
> worth to do.
Now that you mention it, we already have the correct frame length in
payload.len. Let me draft up a new patch with that.
> Side question: Do you think the below is correct (& operator)?
>
> sp.len = get_unaligned_le16(&((struct ssh_frame *)sf.ptr)->len);
>
> To me seems like you take an address to len member rather its value.
That's the point though, no? The signature is
u16 get_unaligned_le16(const void *p)
so we do want a pointer to the len member. So I believe that is correct.
>
>> }
>>
>> static int ssh_ptl_rx_threadfn(void *data)
>
next prev parent reply other threads:[~2021-02-11 12:09 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-10 23:04 Maximilian Luz
2021-02-10 23:51 ` mark gross
2021-02-11 10:22 ` Andy Shevchenko
2021-02-11 11:58 ` Maximilian Luz [this message]
2021-02-11 13:04 ` Andy Shevchenko
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=b68b7547-5be4-c823-d015-febb5e7f84e9@gmail.com \
--to=luzmaximilian@gmail.com \
--cc=andriy.shevchenko@linux.intel.com \
--cc=hdegoede@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=lkp@intel.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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®