mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-09-27 04:47:05 +00:00
kobject_uevent: remove warning in init_uevent_argv()
commit b4104180a2
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:
parent
658e8982f0
commit
fb80624f39
1 changed files with 5 additions and 4 deletions
|
@ -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)
|
||||
{
|
||||
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;
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue