diff for duplicates of <20181128232019.GC131170@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 1e6276a..2f9b83b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -16,10 +16,10 @@ On Sat, Nov 03, 2018 at 10:30:35AM -0700, Eric Biggers wrote: > --- 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 06f3a3c..84e0f97 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020181103173035.23974-1-ebiggers@kernel.org\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0Re: [PATCH] KEYS: fix parsing invalid pkey info string\0" - "Date\0Wed, 28 Nov 2018 23:20:20 +0000\0" + "Date\0Wed, 28 Nov 2018 15:20:20 -0800\0" "To\0keyrings@vger.kernel.org" " dhowells@redhat.com\0" "Cc\0linux-security-module@vger.kernel.org" @@ -28,10 +28,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" @@ -43,4 +43,4 @@ "\n" - Eric -202678e63c83e6f652f729b749ac3349dd1bfac066d214f434a8aa13f901c3e5 +4968ba43533d97c7e32e5c9c5eb959a37a7eb77440a16e3bd37eec043a030702
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.