diff for duplicates of <20191127025212.3077-2-nramas@linux.microsoft.com> diff --git a/a/1.txt b/N1/1.txt index 267f35a..1e1890f 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -81,13 +81,15 @@ index ca895f9a6504..10deb77b22a0 100644 + + entry = kzalloc(sizeof(*entry), GFP_KERNEL); + if (entry) { -+ entry->payload + kmemdup(payload, payload_len, GFP_KERNEL); -+ entry->keyring_name + kstrdup(keyring->description, GFP_KERNEL); ++ entry->payload = ++ kmemdup(payload, payload_len, GFP_KERNEL); ++ entry->keyring_name = ++ kstrdup(keyring->description, GFP_KERNEL); + entry->payload_len = payload_len; + } + -+ if ((entry = NULL) || (entry->payload = NULL) || -+ (entry->keyring_name = NULL)) { ++ if ((entry == NULL) || (entry->payload == NULL) || ++ (entry->keyring_name == NULL)) { + rc = -ENOMEM; + goto out; + } @@ -198,8 +200,8 @@ index ca895f9a6504..10deb77b22a0 100644 if (key->type != &key_type_asymmetric) return; -- if (!payload || (plen = 0)) -+ if (!payload || (payload_len = 0)) +- if (!payload || (plen == 0)) ++ if (!payload || (payload_len == 0)) return; /* diff --git a/a/content_digest b/N1/content_digest index 56e98f5..7e87ac8 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020191127025212.3077-1-nramas@linux.microsoft.com\0" "From\0Lakshmi Ramasubramanian <nramas@linux.microsoft.com>\0" "Subject\0[PATCH v0 1/2] IMA: Defined queue functions\0" - "Date\0Wed, 27 Nov 2019 02:52:11 +0000\0" + "Date\0Tue, 26 Nov 2019 18:52:11 -0800\0" "To\0zohar@linux.ibm.com" " linux-integrity@vger.kernel.org\0" "Cc\0eric.snowberg@oracle.com" @@ -96,13 +96,15 @@ "+\n" "+\tentry = kzalloc(sizeof(*entry), GFP_KERNEL);\n" "+\tif (entry) {\n" - "+\t\tentry->payload +\t\t\tkmemdup(payload, payload_len, GFP_KERNEL);\n" - "+\t\tentry->keyring_name +\t\t\tkstrdup(keyring->description, GFP_KERNEL);\n" + "+\t\tentry->payload =\n" + "+\t\t\tkmemdup(payload, payload_len, GFP_KERNEL);\n" + "+\t\tentry->keyring_name =\n" + "+\t\t\tkstrdup(keyring->description, GFP_KERNEL);\n" "+\t\tentry->payload_len = payload_len;\n" "+\t}\n" "+\n" - "+\tif ((entry = NULL) || (entry->payload = NULL) ||\n" - "+\t (entry->keyring_name = NULL)) {\n" + "+\tif ((entry == NULL) || (entry->payload == NULL) ||\n" + "+\t (entry->keyring_name == NULL)) {\n" "+\t\trc = -ENOMEM;\n" "+\t\tgoto out;\n" "+\t}\n" @@ -213,8 +215,8 @@ " \tif (key->type != &key_type_asymmetric)\n" " \t\treturn;\n" " \n" - "-\tif (!payload || (plen = 0))\n" - "+\tif (!payload || (payload_len = 0))\n" + "-\tif (!payload || (plen == 0))\n" + "+\tif (!payload || (payload_len == 0))\n" " \t\treturn;\n" " \n" " \t/*\n" @@ -230,4 +232,4 @@ "-- \n" 2.17.1 -4193587815afe984b51810e89be35deaa68e78d0498055f0fb32200e5f128068 +22524fec07b1b4df0e6a101e0537c9ded4c1136d99c8284f2c984c2954c0c566
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.