From: Denis Efremov <efremov@linux.com> To: Julia Lawall <Julia.Lawall@lip6.fr>, Joe Perches <joe@perches.com> Cc: Denis Efremov <efremov@linux.com>, cocci@systeme.lip6.fr, linux-kernel@vger.kernel.org Subject: [PATCH 2/2] Coccinelle: extend memdup_user rule with vmemdup_user() Date: Sat, 30 May 2020 23:53:48 +0300 [thread overview] Message-ID: <20200530205348.5812-3-efremov@linux.com> (raw) In-Reply-To: <20200530205348.5812-1-efremov@linux.com> Add vmemdup_user() transformations to the memdup_user.cocci rule. Commit 50fd2f298bef ("new primitive: vmemdup_user()") introduced vmemdup_user(). The function uses kvmalloc with GPF_USER flag. Signed-off-by: Denis Efremov <efremov@linux.com> --- scripts/coccinelle/api/memdup_user.cocci | 49 +++++++++++++++++++++++- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/scripts/coccinelle/api/memdup_user.cocci b/scripts/coccinelle/api/memdup_user.cocci index 49f487e6a5c8..a50def35136e 100644 --- a/scripts/coccinelle/api/memdup_user.cocci +++ b/scripts/coccinelle/api/memdup_user.cocci @@ -37,6 +37,28 @@ identifier l1,l2; - ...+> - } +@depends on patch@ +expression from,to,size; +identifier l1,l2; +@@ + +- to = \(kvmalloc\|kvzalloc\)(size,\(GFP_KERNEL\|GFP_USER\)); ++ to = vmemdup_user(from,size); + if ( +- to==NULL ++ IS_ERR(to) + || ...) { + <+... when != goto l1; +- -ENOMEM ++ PTR_ERR(to) + ...+> + } +- if (copy_from_user(to, from, size) != 0) { +- <+... when != goto l2; +- -EFAULT +- ...+> +- } + @r depends on !patch@ expression from,to,size; position p; @@ -48,14 +70,37 @@ statement S1,S2; if (copy_from_user(to, from, size) != 0) S2 -@script:python depends on org@ +@rv depends on !patch@ +expression from,to,size; +position p; +statement S1,S2; +@@ + +* to = \(kvmalloc@p\|kvzalloc@p\)(size,\(GFP_KERNEL\|GFP_USER\)); + if (to==NULL || ...) S1 + if (copy_from_user(to, from, size) != 0) + S2 + +@script:python depends on org && r@ p << r.p; @@ coccilib.org.print_todo(p[0], "WARNING opportunity for memdup_user") -@script:python depends on report@ +@script:python depends on report && r@ p << r.p; @@ coccilib.report.print_report(p[0], "WARNING opportunity for memdup_user") + +@script:python depends on org && rv@ +p << rv.p; +@@ + +coccilib.org.print_todo(p[0], "WARNING opportunity for vmemdup_user") + +@script:python depends on report && rv@ +p << rv.p; +@@ + +coccilib.report.print_report(p[0], "WARNING opportunity for vmemdup_user") -- 2.26.2
WARNING: multiple messages have this Message-ID (diff)
From: Denis Efremov <efremov@linux.com> To: Julia Lawall <Julia.Lawall@lip6.fr>, Joe Perches <joe@perches.com> Cc: cocci@systeme.lip6.fr, linux-kernel@vger.kernel.org Subject: [Cocci] [PATCH 2/2] Coccinelle: extend memdup_user rule with vmemdup_user() Date: Sat, 30 May 2020 23:53:48 +0300 [thread overview] Message-ID: <20200530205348.5812-3-efremov@linux.com> (raw) In-Reply-To: <20200530205348.5812-1-efremov@linux.com> Add vmemdup_user() transformations to the memdup_user.cocci rule. Commit 50fd2f298bef ("new primitive: vmemdup_user()") introduced vmemdup_user(). The function uses kvmalloc with GPF_USER flag. Signed-off-by: Denis Efremov <efremov@linux.com> --- scripts/coccinelle/api/memdup_user.cocci | 49 +++++++++++++++++++++++- 1 file changed, 47 insertions(+), 2 deletions(-) diff --git a/scripts/coccinelle/api/memdup_user.cocci b/scripts/coccinelle/api/memdup_user.cocci index 49f487e6a5c8..a50def35136e 100644 --- a/scripts/coccinelle/api/memdup_user.cocci +++ b/scripts/coccinelle/api/memdup_user.cocci @@ -37,6 +37,28 @@ identifier l1,l2; - ...+> - } +@depends on patch@ +expression from,to,size; +identifier l1,l2; +@@ + +- to = \(kvmalloc\|kvzalloc\)(size,\(GFP_KERNEL\|GFP_USER\)); ++ to = vmemdup_user(from,size); + if ( +- to==NULL ++ IS_ERR(to) + || ...) { + <+... when != goto l1; +- -ENOMEM ++ PTR_ERR(to) + ...+> + } +- if (copy_from_user(to, from, size) != 0) { +- <+... when != goto l2; +- -EFAULT +- ...+> +- } + @r depends on !patch@ expression from,to,size; position p; @@ -48,14 +70,37 @@ statement S1,S2; if (copy_from_user(to, from, size) != 0) S2 -@script:python depends on org@ +@rv depends on !patch@ +expression from,to,size; +position p; +statement S1,S2; +@@ + +* to = \(kvmalloc@p\|kvzalloc@p\)(size,\(GFP_KERNEL\|GFP_USER\)); + if (to==NULL || ...) S1 + if (copy_from_user(to, from, size) != 0) + S2 + +@script:python depends on org && r@ p << r.p; @@ coccilib.org.print_todo(p[0], "WARNING opportunity for memdup_user") -@script:python depends on report@ +@script:python depends on report && r@ p << r.p; @@ coccilib.report.print_report(p[0], "WARNING opportunity for memdup_user") + +@script:python depends on org && rv@ +p << rv.p; +@@ + +coccilib.org.print_todo(p[0], "WARNING opportunity for vmemdup_user") + +@script:python depends on report && rv@ +p << rv.p; +@@ + +coccilib.report.print_report(p[0], "WARNING opportunity for vmemdup_user") -- 2.26.2 _______________________________________________ Cocci mailing list Cocci@systeme.lip6.fr https://systeme.lip6.fr/mailman/listinfo/cocci
next prev parent reply other threads:[~2020-05-30 20:54 UTC|newest] Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top 2020-05-30 20:53 [PATCH 0/2] Update memdup_user.cocci Denis Efremov 2020-05-30 20:53 ` [Cocci] " Denis Efremov 2020-05-30 20:53 ` [PATCH 1/2] Coccinelle: extend memdup_user transformation with GFP_USER Denis Efremov 2020-05-30 20:53 ` [Cocci] " Denis Efremov 2020-06-02 13:24 ` Julia Lawall 2020-06-06 8:24 ` Julia Lawall 2020-06-06 8:24 ` Julia Lawall 2020-06-06 20:36 ` Denis Efremov 2020-06-06 20:36 ` Denis Efremov 2020-06-06 20:46 ` Denis Efremov 2020-06-06 20:46 ` Denis Efremov 2020-06-06 20:50 ` Julia Lawall 2020-06-06 20:50 ` Julia Lawall 2020-05-30 20:53 ` Denis Efremov [this message] 2020-05-30 20:53 ` [Cocci] [PATCH 2/2] Coccinelle: extend memdup_user rule with vmemdup_user() Denis Efremov 2020-06-06 9:27 ` Julia Lawall 2020-06-06 9:27 ` Julia Lawall 2020-05-31 18:43 Markus Elfring 2020-05-31 18:43 ` Markus Elfring 2020-06-01 6:24 Markus Elfring 2020-06-01 6:24 ` Markus Elfring
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20200530205348.5812-3-efremov@linux.com \ --to=efremov@linux.com \ --cc=Julia.Lawall@lip6.fr \ --cc=cocci@systeme.lip6.fr \ --cc=joe@perches.com \ --cc=linux-kernel@vger.kernel.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.