diff for duplicates of <20170109231323.GA89642@beast> diff --git a/a/1.txt b/N1/1.txt index c97f6aa..bae6cf0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -122,7 +122,7 @@ index 000000000000..529232089e91 +virtual org +virtual context + -+ at initialize:python@ ++@initialize:python@ +@@ +# -------------------------Post Matching Process-------------------------- +def post_match_process(rule,p1,p2,src,ptr): @@ -211,7 +211,7 @@ index 000000000000..529232089e91 + ... + } + -+ at script:python depends on report@ ++@script:python depends on report@ +p11 << rule1.p1; +p12 << rule1.p2; +s1 << rule1.src; @@ -232,9 +232,9 @@ index 000000000000..529232089e91 + func(...){ + ... +( -+ ptr = (T0)src at p0 // potential assignment case ++ ptr = (T0)src@p0 // potential assignment case +| -+ ptr = src at p0 ++ ptr = src@p0 +) + ... +( @@ -266,7 +266,7 @@ index 000000000000..529232089e91 + ... + } + -+ at script:python depends on report@ ++@script:python depends on report@ +p21 << rule2.p1; +p22 << rule2.p2; +p2 << rule2.ptr; @@ -286,9 +286,9 @@ index 000000000000..529232089e91 + func(...){ + ... +( -+ ptr = (T0)src at p0 // potential assignment case ++ ptr = (T0)src@p0 // potential assignment case +| -+ ptr = src at p0 ++ ptr = src@p0 +) + ... +( @@ -320,7 +320,7 @@ index 000000000000..529232089e91 + ... + } + -+ at script:python depends on report@ ++@script:python depends on report@ +p31 << rule3.p1; +p32 << rule3.p2; +p3 << rule3.ptr; @@ -359,9 +359,9 @@ index 000000000000..529232089e91 + when != src = src - offset + +( -+ ptr = (T0)src at p0 // potential assignment case ++ ptr = (T0)src@p0 // potential assignment case +| -+ ptr = src at p0 ++ ptr = src@p0 +) + ... + when != ptr = addr @@ -436,7 +436,7 @@ index 000000000000..529232089e91 + ... + } + -+ at script:python depends on report@ ++@script:python depends on report@ +p51 << rule5.p1; +p52 << rule5.p2; +s5 << rule5.src; @@ -488,7 +488,7 @@ index 000000000000..529232089e91 + ... + } + -+ at script:python depends on report@ ++@script:python depends on report@ +p61 << rule6.p1; +p62 << rule6.p2; +s6 << rule6.src; @@ -517,12 +517,12 @@ index 000000000000..b0a71f95bdbf +virtual org +virtual context + -+ at ok@ ++@ok@ +position p; +expression src,dest; +@@ + -+copy_from_user at p(&dest, src, sizeof(dest)) ++copy_from_user@p(&dest, src, sizeof(dest)) + +@cfu_twice@ +position p != ok.p; @@ -538,15 +538,15 @@ index 000000000000..b0a71f95bdbf + when != src -- + when != if (size2 > e1 || ...) { ... return ...; } + when != if (size2 > e1 || ...) { ... size2 = e2 ... } -+*copy_from_user at p(dest2, src, size2) ++*copy_from_user@p(dest2, src, size2) + -+ at script:python depends on org@ ++@script:python depends on org@ +p << cfu_twice.p; +@@ + +cocci.print_main("potentially dangerous second copy_from_user()",p) + -+ at script:python depends on report@ ++@script:python depends on report@ +p << cfu_twice.p; +@@ + @@ -648,7 +648,7 @@ index 000000000000..f57a1d997882 + ... + } + -+ at script:python depends on report@ ++@script:python depends on report@ +p11 << rule1.p1; +p12 << rule1.p2; +s1 << rule1.src; @@ -669,7 +669,7 @@ index 000000000000..f57a1d997882 + func(...){ + ... +( -+ ptr = (T0)src at p0 // potential assignment case ++ ptr = (T0)src@p0 // potential assignment case +| + ptr = src@p0 +) @@ -705,7 +705,7 @@ index 000000000000..f57a1d997882 + ... + } + -+ at script:python depends on report@ ++@script:python depends on report@ +p21 << rule2.p1; +p22 << rule2.p2; +p2 << rule2.ptr; @@ -725,7 +725,7 @@ index 000000000000..f57a1d997882 + func(...){ + ... +( -+ ptr = (T0)src at p0 // potential assignment case ++ ptr = (T0)src@p0 // potential assignment case +| + ptr = src@p0 +) @@ -761,7 +761,7 @@ index 000000000000..f57a1d997882 + ... + } + -+ at script:python depends on report@ ++@script:python depends on report@ +p31 << rule3.p1; +p32 << rule3.p2; +p3 << rule3.ptr; @@ -769,7 +769,7 @@ index 000000000000..f57a1d997882 +@@ +if p31 and p32: + post_match_process(3, p31, p32, s3, p3) -+//----------------------------------- case 4: ptr = src@middle ++//----------------------------------- case 4: ptr = src at middle + +@ rule4 disable drop_cast exists @ +identifier func; @@ -802,9 +802,9 @@ index 000000000000..f57a1d997882 + when != if (size2 > e1 || ...) { ... size2 = e2 ... } + +( -+ ptr = (T0)src at p0 // potential assignment case ++ ptr = (T0)src@p0 // potential assignment case +| -+ ptr = src at p0 ++ ptr = src@p0 +) + ... + when != ptr = addr @@ -829,7 +829,7 @@ index 000000000000..f57a1d997882 + ... + } + -+ at script:python depends on report@ ++@script:python depends on report@ +p41 << rule4.p1; +p42 << rule4.p2; +p4 << rule4.ptr; @@ -884,7 +884,7 @@ index 000000000000..f57a1d997882 + ... + } + -+ at script:python depends on report@ ++@script:python depends on report@ +p51 << rule5.p1; +p52 << rule5.p2; +s5 << rule5.src; @@ -938,7 +938,7 @@ index 000000000000..f57a1d997882 + ... + } + -+ at script:python depends on report@ ++@script:python depends on report@ +p61 << rule6.p1; +p62 << rule6.p2; +s6 << rule6.src; diff --git a/a/content_digest b/N1/content_digest index 8e77d17..5c4ba25 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,11 @@ - "From\0keescook@chromium.org (Kees Cook)\0" - "Subject\0[Cocci] [RFC] coccicheck: add a test for repeat memory fetches\0" + "From\0Kees Cook <keescook@chromium.org>\0" + "Subject\0[RFC] coccicheck: add a test for repeat memory fetches\0" "Date\0Mon, 9 Jan 2017 15:13:23 -0800\0" "To\0cocci@systeme.lip6.fr\0" + "Cc\0Julia Lawall <Julia.Lawall@lip6.fr>" + Pengfei Wang <wpengfeinudt@gmail.com> + Vaishali Thakkar <vthakkar1994@gmail.com> + " linux-kernel@vger.kernel.org\0" "\00:1\0" "b\0" "Okay, this adds a few tests, for people to examine.\n" @@ -128,7 +132,7 @@ "+virtual org\n" "+virtual context\n" "+\n" - "+ at initialize:python@\n" + "+@initialize:python@\n" "+@@\n" "+# -------------------------Post Matching Process--------------------------\n" "+def post_match_process(rule,p1,p2,src,ptr):\n" @@ -217,7 +221,7 @@ "+\t...\n" "+\t}\n" "+\n" - "+ at script:python depends on report@\n" + "+@script:python depends on report@\n" "+p11 << rule1.p1;\n" "+p12 << rule1.p2;\n" "+s1 << rule1.src;\n" @@ -238,9 +242,9 @@ "+\tfunc(...){\n" "+\t...\t\n" "+(\n" - "+\tptr = (T0)src at p0 // potential assignment case\n" + "+\tptr = (T0)src@p0 // potential assignment case\n" "+|\n" - "+\tptr = src at p0\n" + "+\tptr = src@p0\n" "+)\n" "+\t... \n" "+(\n" @@ -272,7 +276,7 @@ "+\t... \n" "+\t}\n" "+\n" - "+ at script:python depends on report@\n" + "+@script:python depends on report@\n" "+p21 << rule2.p1;\n" "+p22 << rule2.p2;\n" "+p2 << rule2.ptr;\n" @@ -292,9 +296,9 @@ "+\tfunc(...){\n" "+\t...\t\n" "+(\n" - "+\tptr = (T0)src at p0 // potential assignment case\n" + "+\tptr = (T0)src@p0 // potential assignment case\n" "+|\n" - "+\tptr = src at p0\n" + "+\tptr = src@p0\n" "+)\n" "+\t... \n" "+(\n" @@ -326,7 +330,7 @@ "+\t... \n" "+\t}\n" "+\n" - "+ at script:python depends on report@\n" + "+@script:python depends on report@\n" "+p31 << rule3.p1;\n" "+p32 << rule3.p2;\n" "+p3 << rule3.ptr;\n" @@ -365,9 +369,9 @@ "+\t\twhen != src = src - offset\n" "+\n" "+(\n" - "+\tptr = (T0)src at p0 // potential assignment case\n" + "+\tptr = (T0)src@p0 // potential assignment case\n" "+|\n" - "+\tptr = src at p0\n" + "+\tptr = src@p0\n" "+)\n" "+\t... \n" "+\t\twhen != ptr = addr\n" @@ -442,7 +446,7 @@ "+\t... \n" "+\t}\n" "+\n" - "+ at script:python depends on report@\n" + "+@script:python depends on report@\n" "+p51 << rule5.p1;\n" "+p52 << rule5.p2;\n" "+s5 << rule5.src;\n" @@ -494,7 +498,7 @@ "+\t... \n" "+\t}\n" "+\n" - "+ at script:python depends on report@\n" + "+@script:python depends on report@\n" "+p61 << rule6.p1;\n" "+p62 << rule6.p2;\n" "+s6 << rule6.src;\n" @@ -523,12 +527,12 @@ "+virtual org\n" "+virtual context\n" "+\n" - "+ at ok@\n" + "+@ok@\n" "+position p;\n" "+expression src,dest;\n" "+@@\n" "+\n" - "+copy_from_user at p(&dest, src, sizeof(dest))\n" + "+copy_from_user@p(&dest, src, sizeof(dest))\n" "+\n" "+@cfu_twice@\n" "+position p != ok.p;\n" @@ -544,15 +548,15 @@ "+ when != src --\n" "+ when != if (size2 > e1 || ...) { ... return ...; }\n" "+ when != if (size2 > e1 || ...) { ... size2 = e2 ... }\n" - "+*copy_from_user at p(dest2, src, size2)\n" + "+*copy_from_user@p(dest2, src, size2)\n" "+\n" - "+ at script:python depends on org@\n" + "+@script:python depends on org@\n" "+p << cfu_twice.p;\n" "+@@\n" "+\n" "+cocci.print_main(\"potentially dangerous second copy_from_user()\",p)\n" "+\n" - "+ at script:python depends on report@\n" + "+@script:python depends on report@\n" "+p << cfu_twice.p;\n" "+@@\n" "+\n" @@ -654,7 +658,7 @@ "+\t...\n" "+\t}\n" "+\n" - "+ at script:python depends on report@\n" + "+@script:python depends on report@\n" "+p11 << rule1.p1;\n" "+p12 << rule1.p2;\n" "+s1 << rule1.src;\n" @@ -675,7 +679,7 @@ "+\tfunc(...){\n" "+\t...\t\n" "+(\n" - "+\tptr = (T0)src at p0 // potential assignment case\n" + "+\tptr = (T0)src@p0 // potential assignment case\n" "+|\n" "+\tptr = src@p0\n" "+)\n" @@ -711,7 +715,7 @@ "+\t... \n" "+\t}\n" "+\n" - "+ at script:python depends on report@\n" + "+@script:python depends on report@\n" "+p21 << rule2.p1;\n" "+p22 << rule2.p2;\n" "+p2 << rule2.ptr;\n" @@ -731,7 +735,7 @@ "+\tfunc(...){\n" "+\t...\t\n" "+(\n" - "+\tptr = (T0)src at p0 // potential assignment case\n" + "+\tptr = (T0)src@p0 // potential assignment case\n" "+|\n" "+\tptr = src@p0\n" "+)\n" @@ -767,7 +771,7 @@ "+\t... \n" "+\t}\n" "+\n" - "+ at script:python depends on report@\n" + "+@script:python depends on report@\n" "+p31 << rule3.p1;\n" "+p32 << rule3.p2;\n" "+p3 << rule3.ptr;\n" @@ -775,7 +779,7 @@ "+@@\n" "+if p31 and p32:\n" "+\tpost_match_process(3, p31, p32, s3, p3)\n" - "+//----------------------------------- case 4: ptr = src@middle\n" + "+//----------------------------------- case 4: ptr = src at middle\n" "+\n" "+@ rule4 disable drop_cast exists @\n" "+identifier func;\n" @@ -808,9 +812,9 @@ "+\t\twhen != if (size2 > e1 || ...) { ... size2 = e2 ... }\n" "+\n" "+(\n" - "+\tptr = (T0)src at p0 // potential assignment case\n" + "+\tptr = (T0)src@p0 // potential assignment case\n" "+|\n" - "+\tptr = src at p0\n" + "+\tptr = src@p0\n" "+)\n" "+\t... \n" "+\t\twhen != ptr = addr\n" @@ -835,7 +839,7 @@ "+\t... \n" "+\t}\n" "+\n" - "+ at script:python depends on report@\n" + "+@script:python depends on report@\n" "+p41 << rule4.p1;\n" "+p42 << rule4.p2;\n" "+p4 << rule4.ptr;\n" @@ -890,7 +894,7 @@ "+\t... \n" "+\t}\n" "+\n" - "+ at script:python depends on report@\n" + "+@script:python depends on report@\n" "+p51 << rule5.p1;\n" "+p52 << rule5.p2;\n" "+s5 << rule5.src;\n" @@ -944,7 +948,7 @@ "+\t... \n" "+\t}\n" "+\n" - "+ at script:python depends on report@\n" + "+@script:python depends on report@\n" "+p61 << rule6.p1;\n" "+p62 << rule6.p2;\n" "+s6 << rule6.src;\n" @@ -960,4 +964,4 @@ "Kees Cook\n" Nexus Security -be377b8ded029307c92f4caeb68b5c6fc5f2671ab1df7ff95bf0bd723e407641 +a599f5cf09df25313af7e5fc81636e84740104fa4d63cbf9b6610a4401ca8374
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.