From: Hans Verkuil <hverkuil@xs4all.nl>
To: Liu Shixin <liushixin2@huawei.com>, Mike Isely <isely@pobox.com>,
Mauro Carvalho Chehab <mchehab@kernel.org>
Cc: linux-media@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: Re: [PATCH -next] [media] media: Replaced simple_strtol() with kstrtoint()
Date: Wed, 26 May 2021 12:08:41 +0200 [thread overview]
Message-ID: <9d949d86-d8d0-7094-c13b-a0ed03ceaef7@xs4all.nl> (raw)
In-Reply-To: <20210524120836.1580468-1-liushixin2@huawei.com>
On 24/05/2021 14:08, Liu Shixin wrote:
> It looks like that memcpy() is a superfluous operation in
> parse_token()/parse_mtoken(). Simple these two functions and
> use kstrtoint() instead of simple_strtol() to avoid data
> overflow.
Always mention which driver you are changing in the subject line.
Just saying 'media:' suggests a subsystem-wide patch, but this is
just for a single driver.
Regards,
Hans
>
> Signed-off-by: Liu Shixin <liushixin2@huawei.com>
> ---
> drivers/media/usb/pvrusb2/pvrusb2-ctrl.c | 25 ++----------------------
> 1 file changed, 2 insertions(+), 23 deletions(-)
>
> diff --git a/drivers/media/usb/pvrusb2/pvrusb2-ctrl.c b/drivers/media/usb/pvrusb2/pvrusb2-ctrl.c
> index 9f71d8c2a3c6..8ae3ad80cccb 100644
> --- a/drivers/media/usb/pvrusb2/pvrusb2-ctrl.c
> +++ b/drivers/media/usb/pvrusb2/pvrusb2-ctrl.c
> @@ -355,11 +355,8 @@ static int parse_token(const char *ptr,unsigned int len,
> int *valptr,
> const char * const *names, unsigned int namecnt)
> {
> - char buf[33];
> unsigned int slen;
> unsigned int idx;
> - int negfl;
> - char *p2;
> *valptr = 0;
> if (!names) namecnt = 0;
> for (idx = 0; idx < namecnt; idx++) {
> @@ -370,18 +367,7 @@ static int parse_token(const char *ptr,unsigned int len,
> *valptr = idx;
> return 0;
> }
> - negfl = 0;
> - if ((*ptr == '-') || (*ptr == '+')) {
> - negfl = (*ptr == '-');
> - ptr++; len--;
> - }
> - if (len >= sizeof(buf)) return -EINVAL;
> - memcpy(buf,ptr,len);
> - buf[len] = 0;
> - *valptr = simple_strtol(buf,&p2,0);
> - if (negfl) *valptr = -(*valptr);
> - if (*p2) return -EINVAL;
> - return 1;
> + return kstrtoint(ptr, 0, valptr) ? -EINVAL : 1;
> }
>
>
> @@ -389,10 +375,8 @@ static int parse_mtoken(const char *ptr,unsigned int len,
> int *valptr,
> const char **names,int valid_bits)
> {
> - char buf[33];
> unsigned int slen;
> unsigned int idx;
> - char *p2;
> int msk;
> *valptr = 0;
> for (idx = 0, msk = 1; valid_bits; idx++, msk <<= 1) {
> @@ -405,12 +389,7 @@ static int parse_mtoken(const char *ptr,unsigned int len,
> *valptr = msk;
> return 0;
> }
> - if (len >= sizeof(buf)) return -EINVAL;
> - memcpy(buf,ptr,len);
> - buf[len] = 0;
> - *valptr = simple_strtol(buf,&p2,0);
> - if (*p2) return -EINVAL;
> - return 0;
> + return kstrtoint(ptr, 0, valptr);
> }
>
>
>
prev parent reply other threads:[~2021-05-26 10:08 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-24 12:08 [PATCH -next] [media] media: Replaced simple_strtol() with kstrtoint() Liu Shixin
2021-05-26 10:08 ` Hans Verkuil [this message]
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=9d949d86-d8d0-7094-c13b-a0ed03ceaef7@xs4all.nl \
--to=hverkuil@xs4all.nl \
--cc=isely@pobox.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-media@vger.kernel.org \
--cc=liushixin2@huawei.com \
--cc=mchehab@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.