diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 19:18:59 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2010-10-28 19:18:59 -0400 |
commit | e596c79050eafea89cf9fe26b7a807643a2a9904 (patch) | |
tree | 36a0c9b0d4cb149c2c5098be2257639631e5d6c6 /scripts/coccinelle/api/kstrdup.cocci | |
parent | 51399a391940e676877c7a791138081f13a0bab7 (diff) | |
parent | 9231d9e02a1f92b52bbb1e4474bfd1903835a993 (diff) |
Merge branch 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6
* 'misc' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild-2.6: (39 commits)
Revert "namespace: add source file location exceptions"
Coccinelle: Add contextual message
Coccinelle: Fix documentation
Coccinelle: Find doubled arguments to boolean or bit operators.
Coccinelle: Find nested lock+irqsave functions that use the same flags variables.
namespace: add source file location exceptions
scripts/extract-ikconfig: add support for bzip2, lzma and lzo
kbuild: check return value of asprintf()
scripts/namespace.pl: improve to get more correct results
scripts/namespace.pl: some bug fixes
scripts/namespace.pl: update file exclusion list
scripts/namespace.pl: fix wrong source path
Coccinelle: Use the -no_show_diff option for org and report mode
Coccinelle: Add a new mode named 'chain'
Coccinelle: Use new comment format to explain kfree.cocci
Coccinelle: Improve user information with a new kind of comment
Coccinelle: Update documentation
MAINTAINERS: Coccinelle: Update email address
Documentation/kbuild: modules.txt cleanup
Documentation/kbuild: major edit of modules.txt sections 5-8
...
Diffstat (limited to 'scripts/coccinelle/api/kstrdup.cocci')
-rw-r--r-- | scripts/coccinelle/api/kstrdup.cocci | 39 |
1 files changed, 39 insertions, 0 deletions
diff --git a/scripts/coccinelle/api/kstrdup.cocci b/scripts/coccinelle/api/kstrdup.cocci new file mode 100644 index 000000000000..e0805ad08d39 --- /dev/null +++ b/scripts/coccinelle/api/kstrdup.cocci | |||
@@ -0,0 +1,39 @@ | |||
1 | /// Use kstrdup rather than duplicating its implementation | ||
2 | /// | ||
3 | // Confidence: High | ||
4 | // Copyright: (C) 2010 Nicolas Palix, DIKU. GPLv2. | ||
5 | // Copyright: (C) 2010 Julia Lawall, DIKU. GPLv2. | ||
6 | // Copyright: (C) 2010 Gilles Muller, INRIA/LiP6. GPLv2. | ||
7 | // URL: http://coccinelle.lip6.fr/ | ||
8 | // Comments: | ||
9 | // Options: -no_includes -include_headers | ||
10 | |||
11 | virtual patch | ||
12 | |||
13 | @@ | ||
14 | expression from,to; | ||
15 | expression flag,E1,E2; | ||
16 | statement S; | ||
17 | @@ | ||
18 | |||
19 | - to = kmalloc(strlen(from) + 1,flag); | ||
20 | + to = kstrdup(from, flag); | ||
21 | ... when != \(from = E1 \| to = E1 \) | ||
22 | if (to==NULL || ...) S | ||
23 | ... when != \(from = E2 \| to = E2 \) | ||
24 | - strcpy(to, from); | ||
25 | |||
26 | @@ | ||
27 | expression x,from,to; | ||
28 | expression flag,E1,E2,E3; | ||
29 | statement S; | ||
30 | @@ | ||
31 | |||
32 | - x = strlen(from) + 1; | ||
33 | ... when != \( x = E1 \| from = E1 \) | ||
34 | - to = \(kmalloc\|kzalloc\)(x,flag); | ||
35 | + to = kstrdup(from, flag); | ||
36 | ... when != \(x = E2 \| from = E2 \| to = E2 \) | ||
37 | if (to==NULL || ...) S | ||
38 | ... when != \(x = E3 \| from = E3 \| to = E3 \) | ||
39 | - memcpy(to, from, x); | ||