Skip to content

Commit a36d9ba

Browse files
committed
kobject_uevent: remove warning in init_uevent_argv()
commit b410418 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/[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 c13f073 commit a36d9ba

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
@@ -128,12 +128,13 @@ static int kobj_usermode_filter(struct kobject *kobj)
128128

129129
static int init_uevent_argv(struct kobj_uevent_env *env, const char *subsystem)
130130
{
131+
int buffer_size = sizeof(env->buf) - env->buflen;
131132
int len;
132133

133-
len = strlcpy(&env->buf[env->buflen], subsystem,
134-
sizeof(env->buf) - env->buflen);
135-
if (len >= (sizeof(env->buf) - env->buflen)) {
136-
WARN(1, KERN_ERR "init_uevent_argv: buffer size too small\n");
134+
len = strlcpy(&env->buf[env->buflen], subsystem, buffer_size);
135+
if (len >= buffer_size) {
136+
pr_warn("init_uevent_argv: buffer size of %d too small, needed %d\n",
137+
buffer_size, len);
137138
return -ENOMEM;
138139
}
139140

0 commit comments

Comments
 (0)