diff options
| author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-30 16:43:02 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-04-30 16:43:02 +0200 |
| commit | 9304bb8a2ca6a1c4af98bd703e4fcdfa141ab606 (patch) | |
| tree | 9308441889990062baf681d34ed6f7f0171ed77e | |
| parent | 3ca667e276ff0991b18293d3c34460dfbbf3c482 (diff) | |
| download | patches-9304bb8a2ca6a1c4af98bd703e4fcdfa141ab606.tar.gz | |
drop kobject_uevent patch that is now upstream
| -rw-r--r-- | 0001-kobject_uevent-remove-warning-in-init_uevent_argv.patch | 39 | ||||
| -rw-r--r-- | series | 1 |
2 files changed, 0 insertions, 40 deletions
diff --git a/0001-kobject_uevent-remove-warning-in-init_uevent_argv.patch b/0001-kobject_uevent-remove-warning-in-init_uevent_argv.patch deleted file mode 100644 index d284c73c14bf08..00000000000000 --- a/0001-kobject_uevent-remove-warning-in-init_uevent_argv.patch +++ /dev/null @@ -1,39 +0,0 @@ -From f5325c6ed20f75bbd22cd467486ca5a28c3dd73c Mon Sep 17 00:00:00 2001 -From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> -Date: Mon, 5 Apr 2021 11:45:50 +0200 -Subject: [PATCH] kobject_uevent: remove warning in init_uevent_argv() - -syzbot can trigger the WARN() in init_uevent_argv() which isn't the -nicest as the code does properly recover and handle the error. So -change the WARN() call to pr_warn() and provide some more information on -what the buffer size that was needed. - -Link: https://lore.kernel.org/r/20201107082206.GA19079@kroah.com -Reported-by: syzbot+92340f7b2b4789907fdb@syzkaller.appspotmail.com -Cc: "Rafael J. Wysocki" <rafael@kernel.org> -Cc: linux-kernel@vger.kernel.org -Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> ---- - lib/kobject_uevent.c | 9 +++++---- - 1 file changed, 5 insertions(+), 4 deletions(-) - ---- a/lib/kobject_uevent.c -+++ b/lib/kobject_uevent.c -@@ -251,12 +251,13 @@ static int kobj_usermode_filter(struct k - - static int init_uevent_argv(struct kobj_uevent_env *env, const char *subsystem) - { -+ int buffer_size = sizeof(env->buf) - env->buflen; - int len; - -- len = strlcpy(&env->buf[env->buflen], subsystem, -- sizeof(env->buf) - env->buflen); -- if (len >= (sizeof(env->buf) - env->buflen)) { -- WARN(1, KERN_ERR "init_uevent_argv: buffer size too small\n"); -+ len = strlcpy(&env->buf[env->buflen], subsystem, buffer_size); -+ if (len >= buffer_size) { -+ pr_warn("init_uevent_argv: buffer size of %d too small, needed %d\n", -+ buffer_size, len); - return -ENOMEM; - } - @@ -1,5 +1,4 @@ # -0001-kobject_uevent-remove-warning-in-init_uevent_argv.patch 0001-Kbuild-provide-a-common-kernel-installation-script.patch 0001-x86-tools-relocs-add-__printf-attribute-to-die.patch 0001-driver-core-aux-test-code.patch |