linux-kernel - Re: [PATCH v3 6/8] coccicheck: add support for requring a coccinelle version

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 linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-ID: <eb46a0e8-8495-6f58-e51d-d5ab76993de0@imag.fr>
Date:	Tue, 21 Jun 2016 23:11:39 +0200
From:	"Nicolas Palix (LIG)" <Nicolas.Palix@...g.fr>
To:	"Luis R. Rodriguez" <mcgrof@...nel.org>, Julia.Lawall@...6.fr,
	Gilles.Muller@...6.fr, mmarek@...e.com
Cc:	linux-kernel@...r.kernel.org, akpm@...ux-foundation.org,
	gregkh@...uxfoundation.org, markivx@...eaurora.org,
	stephen.boyd@...aro.org, zohar@...ux.vnet.ibm.com,
	broonie@...nel.org, ming.lei@...onical.com, tiwai@...e.de,
	johannes@...solutions.net, chunkeey@...glemail.com,
	hauke@...ke-m.de, jwboyer@...oraproject.org,
	dmitry.torokhov@...il.com, dwmw2@...radead.org, jslaby@...e.com,
	torvalds@...ux-foundation.org, deepa.kernel@...il.com,
	cocci@...teme.lip6.fr
Subject: Re: [PATCH v3 6/8] coccicheck: add support for requring a coccinelle
 version

Le 21/06/16 à 21:21, Luis R. Rodriguez a écrit :
> Enable Coccinelle SmPL patches to require a specific version of
> Coccinelle. In the event that the version does not match we just
> inform the user, if the user asked to go through all SmPL patches
> we just inform them of the need for a new version of coccinelle for
> the SmPL patch and continue on with the rest.
>
> This uses the simple kernel scripts/ld-version.sh to create a weight
> on the version provided by spatch. The -dirty attribute is ignored if
> supplied, the benefit of scripts/ld-version.sh is it has a long history
> and well tested.
>
> Signed-off-by: Luis R. Rodriguez <mcgrof@...nel.org>
Acked-by: Nicolas Palix <nicolas.palix@...g.fr>
> ---
>  scripts/coccicheck | 14 ++++++++++++++
>  1 file changed, 14 insertions(+)
>
> diff --git a/scripts/coccicheck b/scripts/coccicheck
> index 998d764636e0..01b6716ea931 100755
> --- a/scripts/coccicheck
> +++ b/scripts/coccicheck
> @@ -5,6 +5,7 @@
>  # version 1.0.0-rc11.
>  #
>
> +DIR="$(dirname $(readlink -f $0))/.."
>  SPATCH="`which ${SPATCH:=spatch}`"
>
>  if [ ! -x "$SPATCH" ]; then
> @@ -12,6 +13,9 @@ if [ ! -x "$SPATCH" ]; then
>      exit 1
>  fi
>
> +SPATCH_VERSION=$($SPATCH --version | head -1 | awk '{print $3}')
> +SPATCH_VERSION_NUM=$(echo $SPATCH_VERSION | ${DIR}/scripts/ld-version.sh)
> +
>  USE_JOBS="no"
>  $SPATCH --help | grep "\-\-jobs" > /dev/null && USE_JOBS="yes"
>
> @@ -171,6 +175,16 @@ coccinelle () {
>      COCCI="$1"
>
>      OPT=`grep "Option" $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
> +		    echo "Skipping coccinele SmPL patch: $COCCI"
> +		    echo "You have coccinelle:           $SPATCH_VERSION"
> +		    echo "This SmPL patch requires:      $REQ"
> +		    return
> +	    fi
> +    fi
>
>  #   The option '--parse-cocci' can be used to syntactically check the SmPL files.
>  #
>


-- 
Nicolas Palix
http://lig-membres.imag.fr/palix/


Download attachment "smime.p7s" of type "application/pkcs7-signature" (2959 bytes)