diff for duplicates of <20170926201105.126166-6-ebiggers3@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 10458be..850a1f0 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -28,9 +28,9 @@ index de834309d100..a038069ac46a 100644 rcu_read_lock(); /* come up with a suitable timeout value */ -- if (key->expiry = 0) { +- if (key->expiry == 0) { + expiry = READ_ONCE(key->expiry); -+ if (expiry = 0) { ++ if (expiry == 0) { memcpy(xbuf, "perm", 5); - } else if (now.tv_sec >= key->expiry) { + } else if (now.tv_sec >= expiry) { @@ -72,3 +72,8 @@ index de834309d100..a038069ac46a 100644 key->perm, -- 2.14.1.992.g2c7b836f3a-goog + +-- +To unsubscribe from this list: send the line "unsubscribe linux-security-module" in +the body of a message to majordomo at vger.kernel.org +More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/a/content_digest b/N1/content_digest index c3c88fc..637f2ea 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020170926201105.126166-1-ebiggers3@gmail.com\0" - "From\0Eric Biggers <ebiggers3@gmail.com>\0" + "From\0ebiggers3@gmail.com (Eric Biggers)\0" "Subject\0[PATCH v2 5/6] KEYS: load key flags and expiry time atomically in proc_keys_show()\0" - "Date\0Tue, 26 Sep 2017 20:11:04 +0000\0" + "Date\0Tue, 26 Sep 2017 13:11:04 -0700\0" "To\0linux-security-module@vger.kernel.org\0" "\00:1\0" "b\0" @@ -35,9 +35,9 @@ " \trcu_read_lock();\n" " \n" " \t/* come up with a suitable timeout value */\n" - "-\tif (key->expiry = 0) {\n" + "-\tif (key->expiry == 0) {\n" "+\texpiry = READ_ONCE(key->expiry);\n" - "+\tif (expiry = 0) {\n" + "+\tif (expiry == 0) {\n" " \t\tmemcpy(xbuf, \"perm\", 5);\n" "-\t} else if (now.tv_sec >= key->expiry) {\n" "+\t} else if (now.tv_sec >= expiry) {\n" @@ -78,6 +78,11 @@ " \t\t xbuf,\n" " \t\t key->perm,\n" "-- \n" - 2.14.1.992.g2c7b836f3a-goog + "2.14.1.992.g2c7b836f3a-goog\n" + "\n" + "--\n" + "To unsubscribe from this list: send the line \"unsubscribe linux-security-module\" in\n" + "the body of a message to majordomo at vger.kernel.org\n" + More majordomo info at http://vger.kernel.org/majordomo-info.html -7f61b0e1a7a4991f19b745d417d4941b6422712bee91056b9b3dd9ad8c861d4b +ef1f5b5ca9da5f1bcc5d1ff202bdfdca8794c0acd4c53a2738fe191b17ed2f38
diff --git a/a/1.txt b/N2/1.txt index 10458be..cf79fa5 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -28,9 +28,9 @@ index de834309d100..a038069ac46a 100644 rcu_read_lock(); /* come up with a suitable timeout value */ -- if (key->expiry = 0) { +- if (key->expiry == 0) { + expiry = READ_ONCE(key->expiry); -+ if (expiry = 0) { ++ if (expiry == 0) { memcpy(xbuf, "perm", 5); - } else if (now.tv_sec >= key->expiry) { + } else if (now.tv_sec >= expiry) { diff --git a/a/content_digest b/N2/content_digest index c3c88fc..6c9186d 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,8 +1,13 @@ "ref\020170926201105.126166-1-ebiggers3@gmail.com\0" "From\0Eric Biggers <ebiggers3@gmail.com>\0" "Subject\0[PATCH v2 5/6] KEYS: load key flags and expiry time atomically in proc_keys_show()\0" - "Date\0Tue, 26 Sep 2017 20:11:04 +0000\0" - "To\0linux-security-module@vger.kernel.org\0" + "Date\0Tue, 26 Sep 2017 13:11:04 -0700\0" + "To\0keyrings@vger.kernel.org\0" + "Cc\0David Howells <dhowells@redhat.com>" + Michael Halcrow <mhalcrow@google.com> + linux-security-module@vger.kernel.org + linux-kernel@vger.kernel.org + " Eric Biggers <ebiggers@google.com>\0" "\00:1\0" "b\0" "From: Eric Biggers <ebiggers@google.com>\n" @@ -35,9 +40,9 @@ " \trcu_read_lock();\n" " \n" " \t/* come up with a suitable timeout value */\n" - "-\tif (key->expiry = 0) {\n" + "-\tif (key->expiry == 0) {\n" "+\texpiry = READ_ONCE(key->expiry);\n" - "+\tif (expiry = 0) {\n" + "+\tif (expiry == 0) {\n" " \t\tmemcpy(xbuf, \"perm\", 5);\n" "-\t} else if (now.tv_sec >= key->expiry) {\n" "+\t} else if (now.tv_sec >= expiry) {\n" @@ -80,4 +85,4 @@ "-- \n" 2.14.1.992.g2c7b836f3a-goog -7f61b0e1a7a4991f19b745d417d4941b6422712bee91056b9b3dd9ad8c861d4b +170bc52f398e0becba9dc738c4c26f6909939f138942943e13c3fa2f7ccc6acf
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.