lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [<thread-prev] [day] [month] [year] [list]
Date:   Wed, 8 Nov 2017 21:03:35 +0800 (CST)
From:   Julia Lawall <julia.lawall@...6.fr>
To:     Masahiro Yamada <yamada.masahiro@...ionext.com>
cc:     "Nicolas Palix (LIG)" <Nicolas.Palix@...g.fr>,
        Julia Lawall <julia.lawall@...6.fr>, cocci@...teme.lip6.fr,
        Linux Kbuild mailing list <linux-kbuild@...r.kernel.org>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Gilles Muller <Gilles.Muller@...6.fr>,
        Michal Marek <michal.lkml@...kovi.net>
Subject: Re: [PATCH] coccinelle: grep Options and Requires fields more
 precisely



On Tue, 7 Nov 2017, Masahiro Yamada wrote:

> 2017-10-26 16:26 GMT+09:00 Nicolas Palix (LIG) <Nicolas.Palix@...g.fr>:
> > Le 26/10/17 à 06:59, Julia Lawall a écrit :
> >>
> >>
> >>
> >> On Thu, 26 Oct 2017, Masahiro Yamada wrote:
> >>
> >>> Currently, the required version for badzero.cocci is picked up from
> >>> its "Comments:" line since it contains the word "Requires".
> >>>
> >>> Surprisingly, ld-version.sh can extract the version number from the
> >>> string "Requires Coccinelle version 1.0.0-rc20 or later", but this
> >>> expectation is fragile.  Fix the .cocci file.  I removed "-rc20"
> >>> because ld-version.sh cannot handle it.
> >>
> >>
> >> OK.
> >>
> >>> Make the coccicheck script to see exact patterns for "Options:" and
> >>> "Requires:" in order to avoid accidental matching to what just happens
> >>> to appear in comment lines.
> >>>
> >>> Signed-off-by: Masahiro Yamada <yamada.masahiro@...ionext.com>
> >>
> >>
> >> Thanks for checking on this!
> >>
> >> Acked-by: Julia Lawall <julia.lawall@...6.fr>
> >
> > Acked-by: Nicolas Palix <nicolas.palix@...g.fr>
> >
> >>
> >>> ---
> >>>
> >>>   scripts/coccicheck                    | 4 ++--
> >>>   scripts/coccinelle/null/badzero.cocci | 2 +-
> >>>   2 files changed, 3 insertions(+), 3 deletions(-)
> >>>
> >>> diff --git a/scripts/coccicheck b/scripts/coccicheck
> >>> index 3e21a1b..1bfa2d2 100755
> >>> --- a/scripts/coccicheck
> >>> +++ b/scripts/coccicheck
> >>> @@ -168,8 +168,8 @@ OPTIONS="$OPTIONS $SPFLAGS"
> >>>   coccinelle () {
> >>>       COCCI="$1"
> >>>
> >>> -    OPT=`grep "Option" $COCCI | cut -d':' -f2`
> >>> -    REQ=`grep "Requires" $COCCI | cut -d':' -f2 | sed "s| ||"`
> >>> +    OPT=`grep "Options:" $COCCI | cut -d':' -f2`
> >>> +    REQ=`grep "Requires:" $COCCI | cut -d':' -f2 | sed "s| ||"`
> >>>       REQ_NUM=$(echo $REQ | ${DIR}/scripts/ld-version.sh)
> >>>       if [ "$REQ_NUM" != "0" ] ; then
> >>>             if [ "$SPATCH_VERSION_NUM" -lt "$REQ_NUM" ] ; then
> >>> diff --git a/scripts/coccinelle/null/badzero.cocci
> >>> b/scripts/coccinelle/null/badzero.cocci
> >>> index 5551da2..f597c80 100644
> >>> --- a/scripts/coccinelle/null/badzero.cocci
> >>> +++ b/scripts/coccinelle/null/badzero.cocci
> >>> @@ -10,7 +10,7 @@
> >>>   // Copyright: (C) 2012 Julia Lawall, INRIA/LIP6.  GPLv2.
> >>>   // Copyright: (C) 2012 Gilles Muller, INRIA/LiP6.  GPLv2.
> >>>   // URL: http://coccinelle.lip6.fr/
> >>> -// Comments: Requires Coccinelle version 1.0.0-rc20 or later
> >>> +// Requires: 1.0.0
> >>>   // Options:
> >>>
> >>>   virtual patch
> >>> --
> >>> 2.7.4
> >>>
> >>>
> >
> >
> > --
> > Nicolas Palix
> > http://lig-membres.imag.fr/palix/
> >
>
>
> Applied to linux-kbuild/misc.

Thanks!

julia

Powered by blists - more mailing lists