diff for duplicates of <20181103015854.7380-1-ebiggers@kernel.org> diff --git a/a/1.txt b/N1/1.txt index 396910e..69f51c6 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,6 +1,6 @@ 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. @@ -47,8 +47,8 @@ index 41bcf57e96f21..99a55145ddcd2 100644 --- 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 467d7a2..9a9e3fb 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\0000000000000a722550577796543@google.com\0" "From\0Eric Biggers <ebiggers@kernel.org>\0" "Subject\0[PATCH v2] KEYS: always initialize keyring_index_key::desc_len\0" - "Date\0Sat, 03 Nov 2018 01:58:54 +0000\0" + "Date\0Fri, 2 Nov 2018 18:58:54 -0700\0" "To\0keyrings@vger.kernel.org" " David Howells <dhowells@redhat.com>\0" "Cc\0linux-security-module@vger.kernel.org" @@ -11,7 +11,7 @@ "b\0" "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" @@ -58,8 +58,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" @@ -117,4 +117,4 @@ "-- \n" 2.19.1 -192848102929a43fc52d24eb183fbc5b4546e1abf09053e289370506d25e18e6 +249ab29aa266057f34b95cb4bb5f79ffbd64534cfdc2914b9a8d8e3218ae7729
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.