diff for duplicates of <20170928212602.41744-6-ebiggers3@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 4edba04..9cfde0a 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -31,7 +31,7 @@ index 9c351bf757b2..3fbc0ff79699 100644 static inline struct ecryptfs_auth_tok * ecryptfs_get_encrypted_key_payload_data(struct key *key) { -- if (key->type == &key_type_encrypted) +- if (key->type = &key_type_encrypted) - return (struct ecryptfs_auth_tok *) - (&((struct encrypted_key_payload *)key->payload.data[0])->payload_data); - else diff --git a/a/content_digest b/N1/content_digest index 29afefd..e75bfa9 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020170928212602.41744-1-ebiggers3@gmail.com\0" "From\0Eric Biggers <ebiggers3@gmail.com>\0" "Subject\0[PATCH 5/7] ecryptfs: fix dereference of NULL user_key_payload\0" - "Date\0Thu, 28 Sep 2017 14:26:00 -0700\0" + "Date\0Thu, 28 Sep 2017 21:26:00 +0000\0" "To\0keyrings@vger.kernel.org\0" "Cc\0David Howells <dhowells@redhat.com>" Michael Halcrow <mhalcrow@google.com> @@ -46,7 +46,7 @@ " static inline struct ecryptfs_auth_tok *\n" " ecryptfs_get_encrypted_key_payload_data(struct key *key)\n" " {\n" - "-\tif (key->type == &key_type_encrypted)\n" + "-\tif (key->type = &key_type_encrypted)\n" "-\t\treturn (struct ecryptfs_auth_tok *)\n" "-\t\t\t(&((struct encrypted_key_payload *)key->payload.data[0])->payload_data);\n" "-\telse\n" @@ -114,4 +114,4 @@ "-- \n" 2.14.2.822.g60be5d43e6-goog -d0084ba67a98cd8e49bc1c7358b51c6a701c86f2bab34c0433554d1413878859 +6a1f47e5236f53176e25dc93371a1a8f2e9dc4c626121349d36be85574b53cdd
diff --git a/a/1.txt b/N2/1.txt index 4edba04..ff10e36 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -98,3 +98,8 @@ index 3cf1546dca82..fa218cd64f74 100644 "tools must match eCryptfs kernel module with major " -- 2.14.2.822.g60be5d43e6-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/N2/content_digest index 29afefd..00ed8d0 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,16 +1,8 @@ "ref\020170928212602.41744-1-ebiggers3@gmail.com\0" - "From\0Eric Biggers <ebiggers3@gmail.com>\0" + "From\0ebiggers3@gmail.com (Eric Biggers)\0" "Subject\0[PATCH 5/7] ecryptfs: fix dereference of NULL user_key_payload\0" "Date\0Thu, 28 Sep 2017 14:26:00 -0700\0" - "To\0keyrings@vger.kernel.org\0" - "Cc\0David Howells <dhowells@redhat.com>" - Michael Halcrow <mhalcrow@google.com> - linux-cachefs@redhat.com - ecryptfs@vger.kernel.org - linux-fscrypt@vger.kernel.org - linux-security-module@vger.kernel.org - Eric Biggers <ebiggers@google.com> - " stable@vger.kernel.org\0" + "To\0linux-security-module@vger.kernel.org\0" "\00:1\0" "b\0" "From: Eric Biggers <ebiggers@google.com>\n" @@ -112,6 +104,11 @@ " \t\tprintk(KERN_ERR \"Data structure version mismatch. Userspace \"\n" " \t\t \"tools must match eCryptfs kernel module with major \"\n" "-- \n" - 2.14.2.822.g60be5d43e6-goog + "2.14.2.822.g60be5d43e6-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 -d0084ba67a98cd8e49bc1c7358b51c6a701c86f2bab34c0433554d1413878859 +cbc4db917475063789739a8464d42b4e6ad8c1c6898f73883b04429b0144365d
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.