Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a659f159 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'kbuild-misc-v4.16' of... 

Merge tag 'kbuild-misc-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild

Pull Kbuild misc updates from Masahiro Yamada:

 - add snap-pkg target to create Linux kernel snap package

 - make out-of-tree creation of source packages fail correctly

 - improve and fix several semantic patches

* tag 'kbuild-misc-v4.16' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild:
  Coccinelle: coccicheck: fix typo
  Coccinelle: memdup: drop spurious line
  Coccinelle: kzalloc-simple: Rename kzalloc-simple to zalloc-simple
  Coccinelle: ifnullfree: Trim the warning reported in report mode
  Coccinelle: alloc_cast: Add more memory allocating functions to the list
  Coccinelle: array_size: report even if include is missing
  Coccinelle: kzalloc-simple: Add all zero allocating functions
  kbuild: pkg: make out-of-tree rpm/deb-pkg build immediately fail
  scripts/package: snap-pkg target
parents 06c8f7a7 1640eea3

.gitignore

+5 −0
Original line number Diff line number Diff line
@@ -65,6 +65,11 @@ modules.builtin 
#

/debian/



#

# Snap directory (make snap-pkg)

#

/snap/



#

# tar directory (make tar*-pkg)

#

scripts/coccicheck

+1 −1
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ coccinelle () { 
    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 "Skipping coccinelle SmPL patch: $COCCI"

		    echo "You have coccinelle:           $SPATCH_VERSION"

		    echo "This SmPL patch requires:      $REQ"

		    return

scripts/coccinelle/api/alloc/alloc_cast.cocci

+71 −21
Original line number Diff line number Diff line
@@ -8,7 +8,8 @@ 
//# need some reformatting.

//

// Confidence: High

// Copyright: 2014, Himangi Saraogi  GPLv2.

// Copyright: (C) 2014 Himangi Saraogi GPLv2.

// Copyright: (C) 2017 Himanshu Jha GPLv2.

// Comments:

// Options: --no-includes --include-headers

//
@@ -18,55 +19,104 @@ virtual patch 
virtual org

virtual report



@initialize:python@

@@

import re

pattern = '__'

m = re.compile(pattern)



@r1 depends on context || patch@

type T;

@@



  (T *)

  \(kmalloc\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\|

   kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\|vmalloc\|vzalloc\|

   dma_alloc_coherent\|dma_zalloc_coherent\|devm_kmalloc\|devm_kzalloc\|

   kvmalloc\|kvzalloc\|kvmalloc_node\|kvzalloc_node\|pci_alloc_consistent\|

   pci_zalloc_consistent\|kmem_alloc\|kmem_zalloc\|kmem_zone_alloc\|

   kmem_zone_zalloc\|vmalloc_node\|vzalloc_node\)(...)



//----------------------------------------------------------

//  For context mode

//----------------------------------------------------------



@depends on context@

type T;

@script:python depends on context@

t << r1.T;

@@



if m.search(t) != None:

        cocci.include_match(False)



@depends on context && r1@

type r1.T;

@@



* (T *)

  \(kmalloc\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\|

   kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\)(...)

   kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\|vmalloc\|vzalloc\|

   dma_alloc_coherent\|dma_zalloc_coherent\|devm_kmalloc\|devm_kzalloc\|

   kvmalloc\|kvzalloc\|kvmalloc_node\|kvzalloc_node\|pci_alloc_consistent\|

   pci_zalloc_consistent\|kmem_alloc\|kmem_zalloc\|kmem_zone_alloc\|

   kmem_zone_zalloc\|vmalloc_node\|vzalloc_node\)(...)



//----------------------------------------------------------

//  For patch mode

//----------------------------------------------------------



@depends on patch@

type T;

@script:python depends on patch@

t << r1.T;

@@



if m.search(t) != None:

        cocci.include_match(False)



@depends on patch && r1@

type r1.T;

@@



- (T *)

  (\(kmalloc\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\|

   kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\)(...))

  \(kmalloc\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\|

   kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\|vmalloc\|vzalloc\|

   dma_alloc_coherent\|dma_zalloc_coherent\|devm_kmalloc\|devm_kzalloc\|

   kvmalloc\|kvzalloc\|kvmalloc_node\|kvzalloc_node\|pci_alloc_consistent\|

   pci_zalloc_consistent\|kmem_alloc\|kmem_zalloc\|kmem_zone_alloc\|

   kmem_zone_zalloc\|vmalloc_node\|vzalloc_node\)(...)



//----------------------------------------------------------

//  For org and report mode

//----------------------------------------------------------



@r depends on org || report@

@r2 depends on org || report@

type T;

position p;

@@



 (T@p *)\(kmalloc\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\|

   kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\)(...)

 (T@p *)

  \(kmalloc\|kzalloc\|kcalloc\|kmem_cache_alloc\|kmem_cache_zalloc\|

   kmem_cache_alloc_node\|kmalloc_node\|kzalloc_node\|vmalloc\|vzalloc\|

   dma_alloc_coherent\|dma_zalloc_coherent\|devm_kmalloc\|devm_kzalloc\|

   kvmalloc\|kvzalloc\|kvmalloc_node\|kvzalloc_node\|pci_alloc_consistent\|

   pci_zalloc_consistent\|kmem_alloc\|kmem_zalloc\|kmem_zone_alloc\|

   kmem_zone_zalloc\|vmalloc_node\|vzalloc_node\)(...)



@script:python depends on org@

p << r.p;

t << r.T;

p << r2.p;

t << r2.T;

@@



if m.search(t) != None:

	cocci.include_match(False)

else:

	coccilib.org.print_safe_todo(p[0], t)



@script:python depends on report@

p << r.p;

t << r.T;

p << r2.p;

t << r2.T;

@@



if m.search(t) != None:

	cocci.include_match(False)

else:

	msg="WARNING: casting value returned by memory allocation function to (%s *) is useless." % (t)

	coccilib.report.print_report(p[0], msg)

scripts/coccinelle/api/alloc/kzalloc-simple.cocci

deleted100644 → 0
+0 −86
Original line number Diff line number Diff line 
///

/// Use kzalloc rather than kmalloc followed by memset with 0

///

/// This considers some simple cases that are common and easy to validate

/// Note in particular that there are no ...s in the rule, so all of the

/// matched code has to be contiguous

///

// Confidence: High

// Copyright: (C) 2009-2010 Julia Lawall, Nicolas Palix, DIKU.  GPLv2.

// Copyright: (C) 2009-2010 Gilles Muller, INRIA/LiP6.  GPLv2.

// URL: http://coccinelle.lip6.fr/rules/kzalloc.html

// Options: --no-includes --include-headers

//

// Keywords: kmalloc, kzalloc

// Version min: < 2.6.12 kmalloc

// Version min:   2.6.14 kzalloc

//



virtual context

virtual patch

virtual org

virtual report



//----------------------------------------------------------

//  For context mode

//----------------------------------------------------------



@depends on context@

type T, T2;

expression x;

expression E1,E2;

statement S;

@@



* x = (T)kmalloc(E1,E2);

  if ((x==NULL) || ...) S

* memset((T2)x,0,E1);



//----------------------------------------------------------

//  For patch mode

//----------------------------------------------------------



@depends on patch@

type T, T2;

expression x;

expression E1,E2;

statement S;

@@



- x = (T)kmalloc(E1,E2);

+ x = kzalloc(E1,E2);

  if ((x==NULL) || ...) S

- memset((T2)x,0,E1);



//----------------------------------------------------------

//  For org mode

//----------------------------------------------------------



@r depends on org || report@

type T, T2;

expression x;

expression E1,E2;

statement S;

position p;

@@



 x = (T)kmalloc@p(E1,E2);

 if ((x==NULL) || ...) S

 memset((T2)x,0,E1);



@script:python depends on org@

p << r.p;

x << r.x;

@@



msg="%s" % (x)

msg_safe=msg.replace("[","@(").replace("]",")")

coccilib.org.print_todo(p[0], msg_safe)



@script:python depends on report@

p << r.p;

x << r.x;

@@



msg="WARNING: kzalloc should be used for %s, instead of kmalloc/memset" % (x)

coccilib.report.print_report(p[0], msg)

scripts/coccinelle/api/alloc/zalloc-simple.cocci

0 → 100644
+448 −0
Original line number Diff line number Diff line 
///

/// Use zeroing allocator rather than allocator followed by memset with 0

///

/// This considers some simple cases that are common and easy to validate

/// Note in particular that there are no ...s in the rule, so all of the

/// matched code has to be contiguous

///

// Confidence: High

// Copyright: (C) 2009-2010 Julia Lawall, Nicolas Palix, DIKU.  GPLv2.

// Copyright: (C) 2009-2010 Gilles Muller, INRIA/LiP6.  GPLv2.

// Copyright: (C) 2017 Himanshu Jha GPLv2.

// URL: http://coccinelle.lip6.fr/rules/kzalloc.html

// Options: --no-includes --include-headers

//

// Keywords: kmalloc, kzalloc

// Version min: < 2.6.12 kmalloc

// Version min:   2.6.14 kzalloc

//



virtual context

virtual patch

virtual org

virtual report



//----------------------------------------------------------

//  For context mode

//----------------------------------------------------------



@depends on context@

type T, T2;

expression x;

expression E1;

statement S;

@@



* x = (T)\(kmalloc(E1, ...)\|vmalloc(E1)\|dma_alloc_coherent(...,E1,...)\|

  kmalloc_node(E1, ...)\|kmem_cache_alloc(...)\|kmem_alloc(E1, ...)\|

  devm_kmalloc(...,E1,...)\|kvmalloc(E1, ...)\|pci_alloc_consistent(...,E1,...)\|

  kvmalloc_node(E1,...)\);

  if ((x==NULL) || ...) S

* memset((T2)x,0,E1);



//----------------------------------------------------------

//  For patch mode

//----------------------------------------------------------



@depends on patch@

type T, T2;

expression x;

expression E1,E2,E3,E4;

statement S;

@@



(

- x = kmalloc(E1,E2);

+ x = kzalloc(E1,E2);

|

- x = (T *)kmalloc(E1,E2);

+ x = kzalloc(E1,E2);

|

- x = (T)kmalloc(E1,E2);

+ x = (T)kzalloc(E1,E2);

|

- x = vmalloc(E1);

+ x = vzalloc(E1);

|

- x = (T *)vmalloc(E1);

+ x = vzalloc(E1);

|

- x = (T)vmalloc(E1);

+ x = (T)vzalloc(E1);

|

- x = dma_alloc_coherent(E2,E1,E3,E4);

+ x = dma_zalloc_coherent(E2,E1,E3,E4);

|

- x = (T *)dma_alloc_coherent(E2,E1,E3,E4);

+ x = dma_zalloc_coherent(E2,E1,E3,E4);

|

- x = (T)dma_alloc_coherent(E2,E1,E3,E4);

+ x = (T)dma_zalloc_coherent(E2,E1,E3,E4);

|

- x = kmalloc_node(E1,E2,E3);

+ x = kzalloc_node(E1,E2,E3);

|

- x = (T *)kmalloc_node(E1,E2,E3);

+ x = kzalloc_node(E1,E2,E3);

|

- x = (T)kmalloc_node(E1,E2,E3);

+ x = (T)kzalloc_node(E1,E2,E3);

|

- x = kmem_cache_alloc(E3,E4);

+ x = kmem_cache_zalloc(E3,E4);

|

- x = (T *)kmem_cache_alloc(E3,E4);

+ x = kmem_cache_zalloc(E3,E4);

|

- x = (T)kmem_cache_alloc(E3,E4);

+ x = (T)kmem_cache_zalloc(E3,E4);

|

- x = kmem_alloc(E1,E2);

+ x = kmem_zalloc(E1,E2);

|

- x = (T *)kmem_alloc(E1,E2);

+ x = kmem_zalloc(E1,E2);

|

- x = (T)kmem_alloc(E1,E2);

+ x = (T)kmem_zalloc(E1,E2);

|

- x = devm_kmalloc(E2,E1,E3);

+ x = devm_kzalloc(E2,E1,E3);

|

- x = (T *)devm_kmalloc(E2,E1,E3);

+ x = devm_kzalloc(E2,E1,E3);

|

- x = (T)devm_kmalloc(E2,E1,E3);

+ x = (T)devm_kzalloc(E2,E1,E3);

|

- x = kvmalloc(E1,E2);

+ x = kvzalloc(E1,E2);

|

- x = (T *)kvmalloc(E1,E2);

+ x = kvzalloc(E1,E2);

|

- x = (T)kvmalloc(E1,E2);

+ x = (T)kvzalloc(E1,E2);

|

- x = pci_alloc_consistent(E2,E1,E3);

+ x = pci_zalloc_consistent(E2,E1,E3);

|

- x = (T *)pci_alloc_consistent(E2,E1,E3);

+ x = pci_zalloc_consistent(E2,E1,E3);

|

- x = (T)pci_alloc_consistent(E2,E1,E3);

+ x = (T)pci_zalloc_consistent(E2,E1,E3);

|

- x = kvmalloc_node(E1,E2,E3);

+ x = kvzalloc_node(E1,E2,E3);

|

- x = (T *)kvmalloc_node(E1,E2,E3);

+ x = kvzalloc_node(E1,E2,E3);

|

- x = (T)kvmalloc_node(E1,E2,E3);

+ x = (T)kvzalloc_node(E1,E2,E3);

)

  if ((x==NULL) || ...) S

- memset((T2)x,0,E1);



//----------------------------------------------------------

//  For org mode

//----------------------------------------------------------



@r depends on org || report@

type T, T2;

expression x;

expression E1,E2;

statement S;

position p;

@@



 x = (T)kmalloc@p(E1,E2);

 if ((x==NULL) || ...) S

 memset((T2)x,0,E1);



@script:python depends on org@

p << r.p;

x << r.x;

@@



msg="%s" % (x)

msg_safe=msg.replace("[","@(").replace("]",")")

coccilib.org.print_todo(p[0], msg_safe)



@script:python depends on report@

p << r.p;

x << r.x;

@@



msg="WARNING: kzalloc should be used for %s, instead of kmalloc/memset" % (x)

coccilib.report.print_report(p[0], msg)



//-----------------------------------------------------------------

@r1 depends on org || report@

type T, T2;

expression x;

expression E1;

statement S;

position p;

@@



 x = (T)vmalloc@p(E1);

 if ((x==NULL) || ...) S

 memset((T2)x,0,E1);



@script:python depends on org@

p << r1.p;

x << r1.x;

@@



msg="%s" % (x)

msg_safe=msg.replace("[","@(").replace("]",")")

coccilib.org.print_todo(p[0], msg_safe)



@script:python depends on report@

p << r1.p;

x << r1.x;

@@



msg="WARNING: vzalloc should be used for %s, instead of vmalloc/memset" % (x)

coccilib.report.print_report(p[0], msg)



//-----------------------------------------------------------------

@r2 depends on org || report@

type T, T2;

expression x;

expression E1,E2,E3,E4;

statement S;

position p;

@@



 x = (T)dma_alloc_coherent@p(E2,E1,E3,E4);

 if ((x==NULL) || ...) S

 memset((T2)x,0,E1);



@script:python depends on org@

p << r2.p;

x << r2.x;

@@



msg="%s" % (x)

msg_safe=msg.replace("[","@(").replace("]",")")

coccilib.org.print_todo(p[0], msg_safe)



@script:python depends on report@

p << r2.p;

x << r2.x;

@@



msg="WARNING: dma_zalloc_coherent should be used for %s, instead of dma_alloc_coherent/memset" % (x)

coccilib.report.print_report(p[0], msg)



//-----------------------------------------------------------------

@r3 depends on org || report@

type T, T2;

expression x;

expression E1,E2,E3;

statement S;

position p;

@@



 x = (T)kmalloc_node@p(E1,E2,E3);

 if ((x==NULL) || ...) S

 memset((T2)x,0,E1);



@script:python depends on org@

p << r3.p;

x << r3.x;

@@



msg="%s" % (x)

msg_safe=msg.replace("[","@(").replace("]",")")

coccilib.org.print_todo(p[0], msg_safe)



@script:python depends on report@

p << r3.p;

x << r3.x;

@@



msg="WARNING: kzalloc_node should be used for %s, instead of kmalloc_node/memset" % (x)

coccilib.report.print_report(p[0], msg)



//-----------------------------------------------------------------

@r4 depends on org || report@

type T, T2;

expression x;

expression E1,E2,E3;

statement S;

position p;

@@



 x = (T)kmem_cache_alloc@p(E2,E3);

 if ((x==NULL) || ...) S

 memset((T2)x,0,E1);



@script:python depends on org@

p << r4.p;

x << r4.x;

@@



msg="%s" % (x)

msg_safe=msg.replace("[","@(").replace("]",")")

coccilib.org.print_todo(p[0], msg_safe)



@script:python depends on report@

p << r4.p;

x << r4.x;

@@



msg="WARNING: kmem_cache_zalloc should be used for %s, instead of kmem_cache_alloc/memset" % (x)

coccilib.report.print_report(p[0], msg)



//-----------------------------------------------------------------

@r5 depends on org || report@

type T, T2;

expression x;

expression E1,E2;

statement S;

position p;

@@



 x = (T)kmem_alloc@p(E1,E2);

 if ((x==NULL) || ...) S

 memset((T2)x,0,E1);



@script:python depends on org@

p << r5.p;

x << r5.x;

@@



msg="%s" % (x)

msg_safe=msg.replace("[","@(").replace("]",")")

coccilib.org.print_todo(p[0], msg_safe)



@script:python depends on report@

p << r5.p;

x << r5.x;

@@



msg="WARNING: kmem_zalloc should be used for %s, instead of kmem_alloc/memset" % (x)

coccilib.report.print_report(p[0], msg)



//-----------------------------------------------------------------

@r6 depends on org || report@

type T, T2;

expression x;

expression E1,E2,E3;

statement S;

position p;

@@



 x = (T)devm_kmalloc@p(E2,E1,E3);

 if ((x==NULL) || ...) S

 memset((T2)x,0,E1);



@script:python depends on org@

p << r6.p;

x << r6.x;

@@



msg="%s" % (x)

msg_safe=msg.replace("[","@(").replace("]",")")

coccilib.org.print_todo(p[0], msg_safe)



@script:python depends on report@

p << r6.p;

x << r6.x;

@@



msg="WARNING: devm_kzalloc should be used for %s, instead of devm_kmalloc/memset" % (x)

coccilib.report.print_report(p[0], msg)



//-----------------------------------------------------------------

@r7 depends on org || report@

type T, T2;

expression x;

expression E1,E2;

statement S;

position p;

@@



 x = (T)kvmalloc@p(E1,E2);

 if ((x==NULL) || ...) S

 memset((T2)x,0,E1);



@script:python depends on org@

p << r7.p;

x << r7.x;

@@



msg="%s" % (x)

msg_safe=msg.replace("[","@(").replace("]",")")

coccilib.org.print_todo(p[0], msg_safe)



@script:python depends on report@

p << r7.p;

x << r7.x;

@@



msg="WARNING: kvzalloc should be used for %s, instead of kvmalloc/memset" % (x)

coccilib.report.print_report(p[0], msg)



//-----------------------------------------------------------------

@r8 depends on org || report@

type T, T2;

expression x;

expression E1,E2,E3;

statement S;

position p;

@@



 x = (T)pci_alloc_consistent@p(E2,E1,E3);

 if ((x==NULL) || ...) S

 memset((T2)x,0,E1);



@script:python depends on org@

p << r8.p;

x << r8.x;

@@



msg="%s" % (x)

msg_safe=msg.replace("[","@(").replace("]",")")

coccilib.org.print_todo(p[0], msg_safe)



@script:python depends on report@

p << r8.p;

x << r8.x;

@@



msg="WARNING: pci_zalloc_consistent should be used for %s, instead of pci_alloc_consistent/memset" % (x)

coccilib.report.print_report(p[0], msg)

//-----------------------------------------------------------------

@r9 depends on org || report@

type T, T2;

expression x;

expression E1,E2,E3;

statement S;

position p;

@@



 x = (T)kvmalloc_node@p(E1,E2,E3);

 if ((x==NULL) || ...) S

 memset((T2)x,0,E1);



@script:python depends on org@

p << r9.p;

x << r9.x;

@@



msg="%s" % (x)

msg_safe=msg.replace("[","@(").replace("]",")")

coccilib.org.print_todo(p[0], msg_safe)



@script:python depends on report@

p << r9.p;

x << r9.x;

@@



msg="WARNING: kvzalloc_node should be used for %s, instead of kvmalloc_node/memset" % (x)

coccilib.report.print_report(p[0], msg)