OSDN Git Service

staging: android: ion: Switch from WARN to pr_warn
authorLaura Abbott <labbott@redhat.com>
Fri, 5 Jan 2018 19:14:09 +0000 (11:14 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 9 Jan 2018 14:38:48 +0000 (15:38 +0100)
Syzbot reported a warning with Ion:

WARNING: CPU: 0 PID: 3502 at drivers/staging/android/ion/ion-ioctl.c:73 ion_ioctl+0x2db/0x380 drivers/staging/android/ion/ion-ioctl.c:73
Kernel panic - not syncing: panic_on_warn set ...

This is a warning that validation of the ioctl fields failed. This was
deliberately added as a warning to make it very obvious to developers that
something needed to be fixed. In reality, this is overkill and disturbs
fuzzing. Switch to pr_warn for a message instead.

Reported-by: syzbot+fa2d5f63ee5904a0115a@syzkaller.appspotmail.com
Reported-by: syzbot <syzkaller@googlegroups.com>
Signed-off-by: Laura Abbott <labbott@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/android/ion/ion-ioctl.c

index 6ed2cc1..a8d3cc4 100644 (file)
@@ -60,8 +60,10 @@ long ion_ioctl(struct file *filp, unsigned int cmd, unsigned long arg)
                return -EFAULT;
 
        ret = validate_ioctl_arg(cmd, &data);
-       if (WARN_ON_ONCE(ret))
+       if (ret) {
+               pr_warn_once("%s: ioctl validate failed\n", __func__);
                return ret;
+       }
 
        if (!(dir & _IOC_WRITE))
                memset(&data, 0, sizeof(data));