From: quic_zijuhu <quic_zijuhu@quicinc.com>
To: Dmitry Torokhov <dmitry.torokhov@gmail.com>
Cc: <gregkh@linuxfoundation.org>, <rafael@kernel.org>,
<akpm@linux-foundation.org>, <linux-kernel@vger.kernel.org>,
<stable@vger.kernel.org>
Subject: Re: [PATCH v2] kobject_uevent: Fix OOB access within zap_modalias_env()
Date: Wed, 29 May 2024 18:07:06 +0800 [thread overview]
Message-ID: <74e2db16-007a-4b31-b43d-649516000f16@quicinc.com> (raw)
In-Reply-To: <ZlYo20ztfLWPyy5d@google.com>
On 5/29/2024 2:56 AM, Dmitry Torokhov wrote:
> On Tue, May 28, 2024 at 11:19:07AM +0800, Zijun Hu wrote:
>> zap_modalias_env() wrongly calculates size of memory block to move, so
>> will cause OOB memory access issue if variable MODALIAS is not the last
>> one within its @env parameter, fixed by correcting size to memmove.
>>
>> Fixes: 9b3fa47d4a76 ("kobject: fix suppressing modalias in uevents delivered over netlink")
>> Cc: stable@vger.kernel.org
>> Signed-off-by: Zijun Hu <quic_zijuhu@quicinc.com>
>> ---
>> V1 -> V2: Correct commit messages and add inline comments
>>
>> V1 discussion link:
>> https://lore.kernel.org/lkml/0b916393-eb39-4467-9c99-ac1bc9746512@quicinc.com/T/#m8d80165294640dbac72f5c48d14b7ca4f097b5c7
>>
>> lib/kobject_uevent.c | 17 ++++++++++++++++-
>> 1 file changed, 16 insertions(+), 1 deletion(-)
>>
>> diff --git a/lib/kobject_uevent.c b/lib/kobject_uevent.c
>> index 03b427e2707e..f22366be020c 100644
>> --- a/lib/kobject_uevent.c
>> +++ b/lib/kobject_uevent.c
>> @@ -433,8 +433,23 @@ static void zap_modalias_env(struct kobj_uevent_env *env)
>> len = strlen(env->envp[i]) + 1;
>>
>> if (i != env->envp_idx - 1) {
>> + /* @env->envp[] contains pointers to @env->buf[]
>> + * with @env->buflen elements, and we want to
>> + * remove variable MODALIAS pointed by
>> + * @env->envp[i] with length @len as shown below:
>> + *
>> + * 0 @env->buf[] @env->buflen
>> + * ----------------------------------------
>> + * ^ ^ ^
>> + * |-> @len <-| target block |
>> + * @env->envp[i] @env->envp[i+1]
>> + *
>> + * so the "target block" indicated above is moved
>> + * backward by @len, and its right size is
>> + * (@env->buf + @env->buflen - @env->envp[i + 1]).
>> + */
>> memmove(env->envp[i], env->envp[i + 1],
>> - env->buflen - len);
>> + env->buf + env->buflen - env->envp[i + 1]);
>
> Thank you for noticing this, it is indeed a bug.
>
> I wonder if this would not be expressed better as:
>
> tail_len = env->buflen - (env->envp[i + 1] - env->envp[0]);
> memmove(env->envp[i], env->envp[i + 1], tail_len);
>
> and we would not need the large comment.
>
Greg KH suggests add inline comments since my fix is not obvious with
first glance, let us wait for his comments within 2 days about below
question:
is it okay to remove those inline comments if block size to move is
changed to env->buflen - (env->envp[i + 1] - env->envp[0]) ?
> Otherwise:
>
> Acked-by: Dmitry Torokhov <dmitry.torokhov@gmail.com>
>
>>
>> for (j = i; j < env->envp_idx - 1; j++)
>> env->envp[j] = env->envp[j + 1] - len;
>> --
>> 2.7.4
>>
>
> Thanks.
>
next prev parent reply other threads:[~2024-05-29 10:07 UTC|newest]
Thread overview: 5+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-05-28 3:19 Zijun Hu
2024-05-28 18:56 ` Dmitry Torokhov
2024-05-29 10:07 ` quic_zijuhu [this message]
2024-05-29 10:17 ` Greg KH
2024-05-29 10:21 ` quic_zijuhu
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=74e2db16-007a-4b31-b43d-649516000f16@quicinc.com \
--to=quic_zijuhu@quicinc.com \
--cc=akpm@linux-foundation.org \
--cc=dmitry.torokhov@gmail.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=rafael@kernel.org \
--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 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®