Commit a9edadbf authored by Mark Lord's avatar Mark Lord Committed by Linus Torvalds

fix uevent action-string regression

Mark Lord wrote:
>
> On boot, syslog is flooded with "uevent: unsupported action-string;" messages.
..
> Mar 28 14:43:29 shrimp kernel: tty ptyqd: uevent: unsupported
> action-string; this will be ignored in a future kernel version
> Mar 28 14:43:29 shrimp kernel: tty ptyqe: uevent: unsupported
> action-string; this will be ignored in a future kernel version
> Mar 28 14:43:29 shrimp kernel: tty ptyqf: uevent: unsupported
> action-string; this will be ignored in a future kernel version
> Mar 28 14:43:29 shrimp kernel: tty ptyr0: uevent: unsupported
> action-string; this will be ignored in a future kernel version
..

These messages are a regression compared with 2.6.24, which did not
flood the syslog with them.

The actual underlying problem was introduced in 2.6.23, when somebody
made the string parsing no longer accept nul-terminated strings as a
valid input to store_uevent().

Eg.  "add\0" was valid prior to 2.6.23, where the code regressed to
require "add" without the '\0'.

This patch fixes the 2.6.23 / 2.6.24 regressions, by having the code
once again tolerate the trailing '\0', if present.

According to GregKH, this mainly affects older Ubuntu systems, such as
the one I have here that requires this fix.
Signed-off-by: default avatarMark Lord <mlord@pobox.com>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent eb08b6b9
...@@ -55,7 +55,7 @@ int kobject_action_type(const char *buf, size_t count, ...@@ -55,7 +55,7 @@ int kobject_action_type(const char *buf, size_t count,
enum kobject_action action; enum kobject_action action;
int ret = -EINVAL; int ret = -EINVAL;
if (count && buf[count-1] == '\n') if (count && (buf[count-1] == '\n' || buf[count-1] == '\0'))
count--; count--;
if (!count) if (!count)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment