Skip to content

Commit b410418

Browse files
committed
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/[email protected] Cc: "Rafael J. Wysocki" <[email protected]> Cc: [email protected] Reported-by: [email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Greg Kroah-Hartman <[email protected]>
1 parent 312723a commit b410418

File tree

1 file changed

+5
-4
lines changed

1 file changed

+5
-4
lines changed

lib/kobject_uevent.c

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -251,12 +251,13 @@ static int kobj_usermode_filter(struct kobject *kobj)
251251

252252
static int init_uevent_argv(struct kobj_uevent_env *env, const char *subsystem)
253253
{
254+
int buffer_size = sizeof(env->buf) - env->buflen;
254255
int len;
255256

256-
len = strlcpy(&env->buf[env->buflen], subsystem,
257-
sizeof(env->buf) - env->buflen);
258-
if (len >= (sizeof(env->buf) - env->buflen)) {
259-
WARN(1, KERN_ERR "init_uevent_argv: buffer size too small\n");
257+
len = strlcpy(&env->buf[env->buflen], subsystem, buffer_size);
258+
if (len >= buffer_size) {
259+
pr_warn("init_uevent_argv: buffer size of %d too small, needed %d\n",
260+
buffer_size, len);
260261
return -ENOMEM;
261262
}
262263

0 commit comments

Comments
 (0)