AcoSail/kernel_optimize_test
8
0
Fork 0
forked from luck/tmp_suning_uos_patched
Code Pull Requests Activity

kobject_uevent: remove warning in init_uevent_argv()

Browse Source 
commit b4104180a2efb85f55e1ba1407885c9421970338 upstream.

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
Cc: "Rafael J. Wysocki" <rafael@kernel.org>
Cc: linux-kernel@vger.kernel.org
Reported-by: syzbot+92340f7b2b4789907fdb@syzkaller.appspotmail.com
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Link: https://lore.kernel.org/r/20210405094852.1348499-1-gregkh@linuxfoundation.org
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Greg Kroah-Hartman 2021-04-05 11:48:52 +02:00
parent 6ece86e9e8
commit 20530f7fde
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/kobject_uevent.c
View File

@ -251,12 +251,13 @@ static int kobj_usermode_filter(struct kobject *kobj)
static int init_uevent_argv(struct kobj_uevent_env *env, const char *subsystem) static int init_uevent_argv(struct kobj_uevent_env *env, const char *subsystem)
{ {
int buffer_size = sizeof(env->buf) - env->buflen;
int len; int len;
len = strlcpy(&env->buf[env->buflen], subsystem, len = strlcpy(&env->buf[env->buflen], subsystem, buffer_size);
sizeof(env->buf) - env->buflen); if (len >= buffer_size) {
if (len >= (sizeof(env->buf) - env->buflen)) { pr_warn("init_uevent_argv: buffer size of %d too small, needed %d\n",
WARN(1, KERN_ERR "init_uevent_argv: buffer size too small\n"); buffer_size, len);
return -ENOMEM; return -ENOMEM;
} }