summaryrefslogtreecommitdiffstats
path: root/kernel/printk.c
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-26 21:35:24 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2012-06-26 21:35:24 +0200
commit6fda135c908d0f38a0167adcbd71094572e3059b (patch)
treec0583c05c9706e15535ba851076c3aeee02ed0d4 /kernel/printk.c
parentprintk: fix regression in SYSLOG_ACTION_CLEAR (diff)
downloadlinux-6fda135c908d0f38a0167adcbd71094572e3059b.tar.xz
linux-6fda135c908d0f38a0167adcbd71094572e3059b.zip
Revert "printk: return -EINVAL if the message len is bigger than the buf size"
This reverts commit b56a39ac263e5b8cafedd551a49c2105e68b98c2. A better patch from Jan will follow this to resolve the issue. Acked-by: Kay Sievers <kay@vrfy.org> Cc: Fengguang Wu <wfg@linux.intel.com> Cc: Yuanhan Liu <yuanhan.liu@linux.intel.com> Cc: Jan Beulich <JBeulich@suse.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'kernel/printk.c')
-rw-r--r--kernel/printk.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/kernel/printk.c b/kernel/printk.c
index d6a1412f6b09..ff05361962e1 100644
--- a/kernel/printk.c
+++ b/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);