diff for duplicates of <20200315192104.GD224162@linux.intel.com> diff --git a/a/1.txt b/N1/1.txt index 0532a9a..b138820 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -2,7 +2,7 @@ On Fri, Mar 13, 2020 at 11:21:00AM -0400, Waiman Long wrote: > A lockdep circular locking dependency report was seen when running a > keyutils test: > -> [12537.027242] =========================== +> [12537.027242] ====================================================== > [12537.059309] WARNING: possible circular locking dependency detected > [12537.088148] 4.18.0-147.7.1.el8_1.x86_64+debug #1 Tainted: G OE --------- - - > [12537.125253] ------------------------------------------------------ @@ -235,7 +235,7 @@ On Fri, Mar 13, 2020 at 11:21:00AM -0400, Waiman Long wrote: > + > + down_read(&key->sem); > + ret = key_validate(key); -> + if (ret = 0) +> + if (ret == 0) > + ret = key->type->read(key, buffer, buflen); > + up_read(&key->sem); > + return ret; @@ -284,7 +284,7 @@ On Fri, Mar 13, 2020 at 11:21:00AM -0400, Waiman Long wrote: > */ > - down_read(&key->sem); > - ret = key_validate(key); -> - if (ret = 0) +> - if (ret == 0) > - ret = key->type->read(key, buffer, buflen); > - up_read(&key->sem); > + if ((ret > 0) && (ret <= buflen)) { diff --git a/a/content_digest b/N1/content_digest index 1d6a5e5..0871c81 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -2,7 +2,7 @@ "ref\020200313152102.1707-2-longman@redhat.com\0" "From\0Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>\0" "Subject\0Re: [PATCH v3 1/3] KEYS: Don't write out to userspace while holding key semaphore\0" - "Date\0Sun, 15 Mar 2020 19:21:04 +0000\0" + "Date\0Sun, 15 Mar 2020 21:21:04 +0200\0" "To\0Waiman Long <longman@redhat.com>\0" "Cc\0David Howells <dhowells@redhat.com>" James Morris <jmorris@namei.org> @@ -23,7 +23,7 @@ "> A lockdep circular locking dependency report was seen when running a\n" "> keyutils test:\n" "> \n" - "> [12537.027242] ===========================\n" + "> [12537.027242] ======================================================\n" "> [12537.059309] WARNING: possible circular locking dependency detected\n" "> [12537.088148] 4.18.0-147.7.1.el8_1.x86_64+debug #1 Tainted: G OE --------- - -\n" "> [12537.125253] ------------------------------------------------------\n" @@ -256,7 +256,7 @@ "> +\n" "> +\tdown_read(&key->sem);\n" "> +\tret = key_validate(key);\n" - "> +\tif (ret = 0)\n" + "> +\tif (ret == 0)\n" "> +\t\tret = key->type->read(key, buffer, buflen);\n" "> +\tup_read(&key->sem);\n" "> +\treturn ret;\n" @@ -305,7 +305,7 @@ "> \t\t */\n" "> -\t\tdown_read(&key->sem);\n" "> -\t\tret = key_validate(key);\n" - "> -\t\tif (ret = 0)\n" + "> -\t\tif (ret == 0)\n" "> -\t\t\tret = key->type->read(key, buffer, buflen);\n" "> -\t\tup_read(&key->sem);\n" "> +\t\tif ((ret > 0) && (ret <= buflen)) {\n" @@ -440,4 +440,4 @@ "\n" /Jarkko -33116008a274edaabf194c109e76d65a55492a7337a9d4d7f63ce909d063d5b3 +0060140f3269a4ef055f37f7fc5cd08d5e3828dd7175f2418194cf882bb9b212
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.