diff for duplicates of <20181217181244.220052-1-ebiggers@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 962f318..73ef6ad 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -23,10 +23,10 @@ index 783978842f13a..987fac8051d70 100644 --- a/security/keys/keyctl_pkey.c +++ b/security/keys/keyctl_pkey.c @@ -50,6 +50,8 @@ static int keyctl_pkey_params_parse(struct kernel_pkey_params *params) - if (*p = '\0' || *p = ' ' || *p = '\t') + if (*p == '\0' || *p == ' ' || *p == '\t') continue; token = match_token(p, param_keys, args); -+ if (token = Opt_err) ++ if (token == Opt_err) + return -EINVAL; if (__test_and_set_bit(token, &token_mask)) return -EINVAL; diff --git a/a/content_digest b/N1/content_digest index 6279719..8d3f8d2 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020181128232019.GC131170@gmail.com\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[PATCH RESEND] KEYS: fix parsing invalid pkey info string\0" - "Date\0Mon, 17 Dec 2018 18:12:44 +0000\0" + "Date\0Mon, 17 Dec 2018 10:12:44 -0800\0" "To\0Linus Torvalds <torvalds@linux-foundation.org>\0" "Cc\0David Howells <dhowells@redhat.com>" keyrings@vger.kernel.org @@ -34,10 +34,10 @@ "--- a/security/keys/keyctl_pkey.c\n" "+++ b/security/keys/keyctl_pkey.c\n" "@@ -50,6 +50,8 @@ static int keyctl_pkey_params_parse(struct kernel_pkey_params *params)\n" - " \t\tif (*p = '\\0' || *p = ' ' || *p = '\\t')\n" + " \t\tif (*p == '\\0' || *p == ' ' || *p == '\\t')\n" " \t\t\tcontinue;\n" " \t\ttoken = match_token(p, param_keys, args);\n" - "+\t\tif (token = Opt_err)\n" + "+\t\tif (token == Opt_err)\n" "+\t\t\treturn -EINVAL;\n" " \t\tif (__test_and_set_bit(token, &token_mask))\n" " \t\t\treturn -EINVAL;\n" @@ -45,4 +45,4 @@ "-- \n" 2.20.0.405.gbc1bbc6f85-goog -bd56cad166556d84b4d6983108bce0dbd431cc9c1710d3688a641a76a7833448 +de50452cff24ee80cf8e24545cc1768b84731eecf366b32ffe472f218563f6fc
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.