Fix null pointer dereference caused by sysfs_notify on binary attribute
PATCH 1/1 Fix null pointer dereference caused by sysfs_notify on binary attribute
It would be nice to have this work as expected but for now this is a minimal fix to prevent the kernel panic.
--- fs/sysfs/file.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
fs/sysfs/file.c +6 -4
@@ -449,10 +449,12 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)spin_lock_irqsave (&sysfs_open_dirent_lock, flags); - od = sd->s_attr.open; -if (od) { -atomic_inc (&od->event); -wake_up_interruptible (&od->poll); +if (sd->s_attr) { + od = sd->s_attr.open; +if (od) { +atomic_inc (&od->event); +wake_up_interruptible (&od->poll); + } }spin_unlock_irqrestore (&sysfs_open_dirent_lock, flags);
Signature · 1 line
1.7.10.4
Greg KH
maintainerQuoted 2 lines · Nick Dyer
It would be nice to have this work as expected but for now this is a minimal fix to prevent the kernel panic.
Is anyone calling sysfs_notify on a binary attribute today? Or can this go into 3.11?
thanks,
greg k-h
Quoted 6 lines · Greg KH
Quoted 2 lines · Nick Dyer
It would be nice to have this work as expected but for now this is a minimal fix to prevent the kernel panic.
Is anyone calling
sysfs_notifyon a binary attribute today? Or can this go into 3.11?
Nope. I think I'm the first person to try it. So 3.11 is fine.
Greg KH
maintainerRe: [PATCH] sysfs: Fix null pointer dereference caused by sysfs_notify on binary attribute
In reply to Nick DyerQuoted 19 lines · Nick Dyer
If
sysfs_notifyis called on a binary attribute, bad things can happen, so prevent it.Note, no in-kernel usage of this is currently present, but in the future, it's good to be safe.
Signed-off-by Nick Dyer <[email protected]>--- fs/sysfs/file.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)fs/sysfs/file.c +0
-0@@ -449,10 +449,12 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)spin_lock_irqsave (&sysfs_open_dirent_lock, flags);
fs/sysfs/file.c void sysfs_notify_dirent(struct sysfs_dirent *sd) · line 457
Quoted 10 lines
fs/sysfs/file.c +6
-4- od = sd->s_attr.open; -if (od) { -atomic_inc (&od->event); -wake_up_interruptible (&od->poll); +if (sd->s_attr) { + od = sd->s_attr.open; +if (od) { +atomic_inc (&od->event); +wake_up_interruptible (&od->poll); + }
Please test build your patches, it makes kernel maintainers very grumpy when you send them patches that are obviously broken :(
greg k-h
PATCH v2 1/1 sysfs_notify is only possible on file attributes
If sysfs_notify is called on a binary attribute, bad things can happen, so prevent it.
Note, no in-kernel usage of this is currently present, but in the future, it's good to be safe.
Changes in V2:
- Also ignore sysfs_notify on dirs, links
- Use WARN_ON rather than silently failing
- Compiled and tested (huge apologies about first submission)
--- fs/sysfs/file.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
fs/sysfs/file.c +6 -4
@@ -449,10 +449,12 @@ void sysfs_notify_dirent(struct sysfs_dirent *sd)spin_lock_irqsave (&sysfs_open_dirent_lock, flags); - od = sd->s_attr.open; -if (od) { -atomic_inc (&od->event); -wake_up_interruptible (&od->poll); +if (!WARN_ON (sysfs_type (sd) !=SYSFS_KOBJ_ATTR )) { + od = sd->s_attr.open; +if (od) { +atomic_inc (&od->event); +wake_up_interruptible (&od->poll); + } }spin_unlock_irqrestore (&sysfs_open_dirent_lock, flags);
Signature · 1 line
1.7.10.4