diff for duplicates of <20181103173035.23974-1-ebiggers@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 8702b0b..947edfb 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -15,10 +15,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 5c60609..57abc1b 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0000000000000c220960579c4936d@google.com\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[PATCH] KEYS: fix parsing invalid pkey info string\0" - "Date\0Sat, 03 Nov 2018 17:30:35 +0000\0" + "Date\0Sat, 3 Nov 2018 10:30:35 -0700\0" "To\0keyrings@vger.kernel.org" " dhowells@redhat.com\0" "Cc\0linux-security-module@vger.kernel.org" @@ -26,10 +26,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" @@ -37,4 +37,4 @@ "-- \n" 2.19.1 -6a78c1c444d45b49e3b198215ada28703ee87fedff7836d7aa5eab32a44783fb +0c5ec99ce4ee15aced2674ae080ecefb91ba5c757d343c330e577c9e02b82fad
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.