Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 311507
b: refs/heads/master
c: 6fda135
h: refs/heads/master
i:
  311505: 79b730a
  311503: 035e1b3
v: v3
  • Loading branch information
Greg Kroah-Hartman committed Jun 26, 2012
1 parent 43ec15a commit a62eb21
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: 4661e3568a7d14a93d4e428d246cdb86f4bac6e7
refs/heads/master: 6fda135c908d0f38a0167adcbd71094572e3059b
4 changes: 1 addition & 3 deletions trunk/kernel/printk.c
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down

0 comments on commit a62eb21

Please sign in to comment.