diff for duplicates of <20190219230434.GC12177@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 8c16801..7778aa7 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -4,7 +4,7 @@ On Thu, Feb 07, 2019 at 03:35:29PM -0800, Eric Biggers wrote: > > > On Fri, Nov 02, 2018 at 06:58:54PM -0700, Eric Biggers wrote: > > > > From: Eric Biggers <ebiggers@google.com> > > > > -> > > > syzbot hit the 'BUG_ON(index_key->desc_len = 0);' in __key_link_begin() +> > > > syzbot hit the 'BUG_ON(index_key->desc_len == 0);' in __key_link_begin() > > > > called from construct_alloc_key() during sys_request_key(), because the > > > > length of the key description was never calculated. > > > > @@ -51,8 +51,8 @@ On Thu, Feb 07, 2019 at 03:35:29PM -0800, Eric Biggers wrote: > > > > --- a/security/keys/keyring.c > > > > +++ b/security/keys/keyring.c > > > > @@ -661,9 +661,6 @@ static bool search_nested_keyrings(struct key *keyring, -> > > > BUG_ON((ctx->flags & STATE_CHECKS) = 0 || -> > > > (ctx->flags & STATE_CHECKS) = STATE_CHECKS); +> > > > BUG_ON((ctx->flags & STATE_CHECKS) == 0 || +> > > > (ctx->flags & STATE_CHECKS) == STATE_CHECKS); > > > > > > > > - if (ctx->index_key.description) > > > > - ctx->index_key.desc_len = strlen(ctx->index_key.description); diff --git a/a/content_digest b/N1/content_digest index a6bb0cb..1142c0e 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -5,7 +5,7 @@ "ref\020190207233529.GB125156@gmail.com\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0Re: [PATCH v2] KEYS: always initialize keyring_index_key::desc_len\0" - "Date\0Tue, 19 Feb 2019 23:04:35 +0000\0" + "Date\0Tue, 19 Feb 2019 15:04:35 -0800\0" "To\0James Morris <jmorris@namei.org>\0" "Cc\0keyrings@vger.kernel.org" David Howells <dhowells@redhat.com> @@ -20,7 +20,7 @@ "> > > On Fri, Nov 02, 2018 at 06:58:54PM -0700, Eric Biggers wrote:\n" "> > > > From: Eric Biggers <ebiggers@google.com>\n" "> > > > \n" - "> > > > syzbot hit the 'BUG_ON(index_key->desc_len = 0);' in __key_link_begin()\n" + "> > > > syzbot hit the 'BUG_ON(index_key->desc_len == 0);' in __key_link_begin()\n" "> > > > called from construct_alloc_key() during sys_request_key(), because the\n" "> > > > length of the key description was never calculated.\n" "> > > > \n" @@ -67,8 +67,8 @@ "> > > > --- a/security/keys/keyring.c\n" "> > > > +++ b/security/keys/keyring.c\n" "> > > > @@ -661,9 +661,6 @@ static bool search_nested_keyrings(struct key *keyring,\n" - "> > > > \tBUG_ON((ctx->flags & STATE_CHECKS) = 0 ||\n" - "> > > > \t (ctx->flags & STATE_CHECKS) = STATE_CHECKS);\n" + "> > > > \tBUG_ON((ctx->flags & STATE_CHECKS) == 0 ||\n" + "> > > > \t (ctx->flags & STATE_CHECKS) == STATE_CHECKS);\n" "> > > > \n" "> > > > -\tif (ctx->index_key.description)\n" "> > > > -\t\tctx->index_key.desc_len = strlen(ctx->index_key.description);\n" @@ -149,4 +149,4 @@ "\n" - Eric -1b6b2b0af68c2f2cf9b0696b766a222d972234596807f370840510e84e3ca1fe +1cc2f340258f67ccf1025dcb810bae8550f4aae61799b5f52fe6f0e9ac8d257b
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.