diff for duplicates of <20200313152102.1707-2-longman@redhat.com> diff --git a/a/1.txt b/N1/1.txt index aa8389a..584862b 100644 --- a/a/1.txt +++ b/N1/1.txt @@ -1,7 +1,7 @@ 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] ------------------------------------------------------ @@ -234,7 +234,7 @@ index 9b898c969558..81f68e434b9f 100644 + + 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; @@ -283,7 +283,7 @@ index 9b898c969558..81f68e434b9f 100644 */ - 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 114797e..8c8e367 100644 --- a/a/content_digest +++ b/N1/content_digest @@ -1,7 +1,7 @@ "ref\020200313152102.1707-1-longman@redhat.com\0" "From\0Waiman Long <longman@redhat.com>\0" "Subject\0[PATCH v3 1/3] KEYS: Don't write out to userspace while holding key semaphore\0" - "Date\0Fri, 13 Mar 2020 15:21:00 +0000\0" + "Date\0Fri, 13 Mar 2020 11:21:00 -0400\0" "To\0David Howells <dhowells@redhat.com>" Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com> James Morris <jmorris@namei.org> @@ -22,7 +22,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" @@ -255,7 +255,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" @@ -304,7 +304,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" @@ -434,4 +434,4 @@ "-- \n" 2.18.1 -27ef428dd3945e358c6c3476683079a133922cdb6dee6faf59360f07e79ea466 +d47a8ee914fc53383a2934d765f9c4529292e863fb2f0018dfd33593abb8f89e
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.