diff for duplicates of <20190207233529.GB125156@gmail.com> diff --git a/a/1.txt b/N1/1.txt index 5d0a132..7e91436 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -3,7 +3,7 @@ On Thu, Jan 10, 2019 at 12:27:46PM -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. > > > @@ -50,8 +50,8 @@ On Thu, Jan 10, 2019 at 12:27:46PM -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 9d4e81e..e250989 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -4,7 +4,7 @@ "ref\020190110202744.GA149637@gmail.com\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0Re: [PATCH v2] KEYS: always initialize keyring_index_key::desc_len\0" - "Date\0Thu, 07 Feb 2019 23:35:30 +0000\0" + "Date\0Thu, 7 Feb 2019 15:35:30 -0800\0" "To\0keyrings@vger.kernel.org" " David Howells <dhowells@redhat.com>\0" "Cc\0linux-security-module@vger.kernel.org" @@ -17,7 +17,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" @@ -64,8 +64,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" @@ -141,4 +141,4 @@ "\n" - Eric -258e8a08d365362c6f947d184045ba2f414e7f4b0f81104716ae690ca758daef +c61d16e5092f21255991fbce3480e7150b3f9c864f9442bae112409c00ef1e8e
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.