diff for duplicates of <20171024184235.GC1806@obsidianresearch.com> diff --git a/a/1.txt b/N1/1.txt index 3f2d707..27a16fc 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -241,7 +241,7 @@ index 1d6729be4cd637..310de288549818 100644 return -EINVAL; - chip = tpm_chip_find_get(chip_num); -- if (chip = NULL) +- if (chip == NULL) - return -ENODEV; - - if (chip->flags & TPM_CHIP_FLAG_TPM2) { @@ -282,7 +282,7 @@ index 1d6729be4cd637..310de288549818 100644 + struct tpm_chip *chip; + + chip = tpm_chip_find_get(chip_num); -+ if (chip = NULL) ++ if (chip == NULL) + return -ENODEV; + + rc = tpm_get_random_dev(chip, out, max); diff --git a/a/content_digest b/N1/content_digest index eec266d..ce7693b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,6 +1,6 @@ "From\0Jason Gunthorpe <jgunthorpe@obsidianresearch.com>\0" "Subject\0[PATCH] tpm: Move Linux RNG connection to hwrng\0" - "Date\0Tue, 24 Oct 2017 18:42:35 +0000\0" + "Date\0Tue, 24 Oct 2017 12:42:35 -0600\0" "To\0Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>\0" "Cc\0PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com>" Stefan Berger <stefanb@linux.vnet.ibm.com> @@ -262,7 +262,7 @@ " \t\treturn -EINVAL;\n" " \n" "-\tchip = tpm_chip_find_get(chip_num);\n" - "-\tif (chip = NULL)\n" + "-\tif (chip == NULL)\n" "-\t\treturn -ENODEV;\n" "-\n" "-\tif (chip->flags & TPM_CHIP_FLAG_TPM2) {\n" @@ -303,7 +303,7 @@ "+\tstruct tpm_chip *chip;\n" "+\n" "+\tchip = tpm_chip_find_get(chip_num);\n" - "+\tif (chip = NULL)\n" + "+\tif (chip == NULL)\n" "+\t\treturn -ENODEV;\n" "+\n" "+\trc = tpm_get_random_dev(chip, out, max);\n" @@ -347,4 +347,4 @@ "-- \n" 2.7.4 -72833f1711ae83cc1ea0f7edc645b78c1f1f8410496a5b27c6f61507380695d1 +c9e3abf7f2ab37ef7e1d3ec170113883ae174ed2e2bfed8b74246f447fe76367
diff --git a/a/1.txt b/N2/1.txt index 3f2d707..dfa3209 100644 --- a/a/1.txt +++ b/N2/1.txt @@ -241,7 +241,7 @@ index 1d6729be4cd637..310de288549818 100644 return -EINVAL; - chip = tpm_chip_find_get(chip_num); -- if (chip = NULL) +- if (chip == NULL) - return -ENODEV; - - if (chip->flags & TPM_CHIP_FLAG_TPM2) { @@ -282,7 +282,7 @@ index 1d6729be4cd637..310de288549818 100644 + struct tpm_chip *chip; + + chip = tpm_chip_find_get(chip_num); -+ if (chip = NULL) ++ if (chip == NULL) + return -ENODEV; + + rc = tpm_get_random_dev(chip, out, max); @@ -325,3 +325,8 @@ index 2d5466a72e40f8..0e41e044d81be2 100644 extern void tpm_add_ppi(struct tpm_chip *chip); -- 2.7.4 + +-- +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 eec266d..bd377b5 100644 --- a/a/content_digest +++ b/N2/content_digest @@ -1,22 +1,7 @@ - "From\0Jason Gunthorpe <jgunthorpe@obsidianresearch.com>\0" + "From\0jgunthorpe@obsidianresearch.com (Jason Gunthorpe)\0" "Subject\0[PATCH] tpm: Move Linux RNG connection to hwrng\0" - "Date\0Tue, 24 Oct 2017 18:42:35 +0000\0" - "To\0Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>\0" - "Cc\0PrasannaKumar Muralidharan <prasannatsmkumar@gmail.com>" - Stefan Berger <stefanb@linux.vnet.ibm.com> - linux-integrity@vger.kernel.org - David Howells <dhowells@redhat.com> - Herbert Xu <herbert@gondor.apana.org.au> - Dmitry Kasatkin <dmitry.kasatkin@gmail.com> - open list <linux-kernel@vger.kernel.org> - linux-security-module@vger.kernel.org - open list:KEYS-TRUSTED <keyrings@vger.kernel.org> - open list:HARDWARE RANDOM NUMBER GENERATOR CORE <linux-crypto@vger.kernel.org> - James Morris <james.l.morris@oracle.com> - Matt Mackall <mpm@selenic.com> - David Safford <safford@us.ibm.com> - Mimi Zohar <zohar@linux.vnet.ibm.com> - " Serge E. Hallyn <serge@hallyn.com>\0" + "Date\0Tue, 24 Oct 2017 12:42:35 -0600\0" + "To\0linux-security-module@vger.kernel.org\0" "\00:1\0" "b\0" "The tpm-rng.c approach is completely inconsistent with how the kernel\n" @@ -262,7 +247,7 @@ " \t\treturn -EINVAL;\n" " \n" "-\tchip = tpm_chip_find_get(chip_num);\n" - "-\tif (chip = NULL)\n" + "-\tif (chip == NULL)\n" "-\t\treturn -ENODEV;\n" "-\n" "-\tif (chip->flags & TPM_CHIP_FLAG_TPM2) {\n" @@ -303,7 +288,7 @@ "+\tstruct tpm_chip *chip;\n" "+\n" "+\tchip = tpm_chip_find_get(chip_num);\n" - "+\tif (chip = NULL)\n" + "+\tif (chip == NULL)\n" "+\t\treturn -ENODEV;\n" "+\n" "+\trc = tpm_get_random_dev(chip, out, max);\n" @@ -345,6 +330,11 @@ " #ifdef CONFIG_ACPI\n" " extern void tpm_add_ppi(struct tpm_chip *chip);\n" "-- \n" - 2.7.4 + "2.7.4\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 -72833f1711ae83cc1ea0f7edc645b78c1f1f8410496a5b27c6f61507380695d1 +d7294a9ef8e775e65ca4e8a3f2870da2901809b11dc73912da0926dd285cfb17
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.