diff --git a/[refs] b/[refs] index 4e5913d11e55..d3aae70f32a8 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4661e3568a7d14a93d4e428d246cdb86f4bac6e7 +refs/heads/master: 6fda135c908d0f38a0167adcbd71094572e3059b diff --git a/trunk/kernel/printk.c b/trunk/kernel/printk.c index d6a1412f6b09..ff05361962e1 100644 --- a/trunk/kernel/printk.c +++ b/trunk/kernel/printk.c @@ -880,9 +880,7 @@ static int syslog_print(char __user *buf, int size) syslog_seq++; raw_spin_unlock_irq(&logbuf_lock); - if (len > size) - len = -EINVAL; - else if (len > 0 && copy_to_user(buf, text, len)) + if (len > 0 && copy_to_user(buf, text, len)) len = -EFAULT; kfree(text);