lkml.org 
[lkml]   [2018]   [Jul]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
Date
From
SubjectRe: [Cocci] [PATCH 01/18] coccinelle: change strncpy+truncation to strlcpy
On Fri, Jul 13, 2018 at 10:00:23AM +0200, Dominique Martinet wrote:
> Himanshu Jha wrote on Fri, Jul 13, 2018:
> > > I expect each maintainer will pick their share of the patchs if they
> > > agree with it and the rest will just be dropped?
> >
> > Masahiro Yamada <yamada.masahiro@socionext.com> takes coccinelle patches,
> > so please cc him or your patch would be lost.
>
> Thanks, will do.
>
> > > +virtual patch
> > > +virtual context
> >
> > You might consider adding context rule or remove this line perhaps ?
>
> Victim of copypasta, I'll remove this.
>
> > > +-strncpy@p(
> > > ++strlcpy(
> > > + dest, src, sz);
> > > +-dest[sz - 1] = '\0';
> >
> > The above rule produces an output that I think is not correct:
> > --------------------------------------------------------------
> > diff =
> > diff -u -p a//ti/wl1251/acx.c b//ti/wl1251/acx.c
> > --- a//ti/wl1251/acx.c
> > +++ b//ti/wl1251/acx.c
> > @@ -150,14 +150,7 @@ int wl1251_acx_fw_version(struct wl1251
> > }
> >
> > /* be careful with the buffer sizes */
> > - strncpy(buf, rev->fw_version, min(len, sizeof(rev->fw_version)));
> > -
> > - /*
> > - * if the firmware version string is exactly
> > - * sizeof(rev->fw_version) long or fw_len is less than
> > - * sizeof(rev->fw_version) it won't be null terminated
> > - */
> > - buf[min(len, sizeof(rev->fw_version)) - 1] = '\0';
> > + strlcpy(buf, rev->fw_version, min(len, sizeof(rev->fw_version)));
> >
> > -----------------------------------------------------------------
> >
> > I think the comment is useful and should not be removed.
>
> I agree this comment is useful now that I'm taking a closer look, I
> glanced at this too fast.
> I'm not sure how to make coccinelle not remove comments between lines
> though?

Well, there is no such facility in Coccinelle to ignore comments.
You can hack with other facilities provided in SmPL though ;)

Try this:

$ spatch -D patch --sp-file strlcopy.cocci --very-quiet drivers/net/wireless/ti/wl1251/acx.c

---------------------------------------------------------------------
virtual patch

@depends on patch@
expression dest, src, sz;
identifier f;
@@

(
- strncpy(
+ strlcpy(
dest, src, sizeof(sz));
- dest[sizeof(sz) - 1] = '\0';
|
- strncpy(
+ strlcpy(
dest, src, f);
- dest[f - 1] = '\0';
)
---------------------------------------------------------------------

This eliminates that case because expression is generic metavariable and
it somehow matched whole "min(len, sizeof(...)..", so it better to
divide the rules as done above to be more specific about the matching
pattern.

I thought to replace "identifier f" with "constant F" but that misses
few cases.

Also, it is advised to put a space affer '+/-'

Thanks.
--
Himanshu Jha
Undergraduate Student
Department of Electronics & Communication
Guru Tegh Bahadur Institute of Technology
\
 
 \ /
  Last update: 2018-07-15 22:06    [W:0.193 / U:0.468 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site