Commit 6519a5ab authored by Denis Efremov's avatar Denis Efremov Committed by Julia Lawall

coccinelle: api: update kzfree script to kfree_sensitive

Commit 453431a5 ("mm, treewide: rename kzfree() to kfree_sensitive()")
renames kzfree to kfree_sensitive and uses memzero_explicit(...) instead of
memset(..., 0, ...) internally. Update cocci script to reflect these
changes.
Signed-off-by: default avatarDenis Efremov <efremov@linux.com>
Signed-off-by: default avatarJulia Lawall <Julia.Lawall@inria.fr>
parent 7c9dc603
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
/// ///
/// Use kzfree, kvfree_sensitive rather than memset or /// Use kfree_sensitive, kvfree_sensitive rather than memset or
/// memzero_explicit followed by kfree /// memzero_explicit followed by kfree.
/// ///
// Confidence: High // Confidence: High
// Copyright: (C) 2020 Denis Efremov ISPRAS // Copyright: (C) 2020 Denis Efremov ISPRAS
// Options: --no-includes --include-headers // Options: --no-includes --include-headers
// //
// Keywords: kzfree, kvfree_sensitive // Keywords: kfree_sensitive, kvfree_sensitive
// //
virtual context virtual context
...@@ -18,7 +18,8 @@ virtual report ...@@ -18,7 +18,8 @@ virtual report
@initialize:python@ @initialize:python@
@@ @@
# kmalloc_oob_in_memset uses memset to explicitly trigger out-of-bounds access # kmalloc_oob_in_memset uses memset to explicitly trigger out-of-bounds access
filter = frozenset(['kmalloc_oob_in_memset', 'kzfree', 'kvfree_sensitive']) filter = frozenset(['kmalloc_oob_in_memset',
'kfree_sensitive', 'kvfree_sensitive'])
def relevant(p): def relevant(p):
return not (filter & {el.current_element for el in p}) return not (filter & {el.current_element for el in p})
...@@ -56,17 +57,13 @@ type T; ...@@ -56,17 +57,13 @@ type T;
- memzero_explicit@m((T)E, size); - memzero_explicit@m((T)E, size);
... when != E ... when != E
when strict when strict
// TODO: uncomment when kfree_sensitive will be merged. (
// Only this case is commented out because developers - kfree(E)@p;
// may not like patches like this since kzfree uses memset + kfree_sensitive(E);
// internally (not memzero_explicit). |
//(
//- kfree(E)@p;
//+ kfree_sensitive(E);
//|
- \(vfree\|kvfree\)(E)@p; - \(vfree\|kvfree\)(E)@p;
+ kvfree_sensitive(E, size); + kvfree_sensitive(E, size);
//) )
@rp_memset depends on patch@ @rp_memset depends on patch@
expression E, size; expression E, size;
...@@ -80,7 +77,7 @@ type T; ...@@ -80,7 +77,7 @@ type T;
when strict when strict
( (
- kfree(E)@p; - kfree(E)@p;
+ kzfree(E); + kfree_sensitive(E);
| |
- \(vfree\|kvfree\)(E)@p; - \(vfree\|kvfree\)(E)@p;
+ kvfree_sensitive(E, size); + kvfree_sensitive(E, size);
...@@ -91,11 +88,11 @@ p << r.p; ...@@ -91,11 +88,11 @@ p << r.p;
@@ @@
coccilib.report.print_report(p[0], coccilib.report.print_report(p[0],
"WARNING: opportunity for kzfree/kvfree_sensitive") "WARNING: opportunity for kfree_sensitive/kvfree_sensitive")
@script:python depends on org@ @script:python depends on org@
p << r.p; p << r.p;
@@ @@
coccilib.org.print_todo(p[0], coccilib.org.print_todo(p[0],
"WARNING: opportunity for kzfree/kvfree_sensitive") "WARNING: opportunity for kfree_sensitive/kvfree_sensitive")
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment