MD: Prevent sysfs operations on uninitialized kobjects
PATCH 1/1 MD: Prevent sysfs operations on uninitialized kobjects
MD: Prevent sysfs operations on uninitialized kobjects
Device-mapper does not use sysfs; but when device-mapper is leveraging MD's RAID personalities, MD sometimes attempts to update sysfs. This patch adds checks for 'mddev-kobj.sd' in sysfs_[un]link_rdev to ensure it is about to operate on something valid. This patch also checks for 'mddev->kobj.sd' before calling 'sysfs_notify' in 'remove_and_add_spares'. Although 'sysfs_notify' already makes this check, doing so in 'remove_and_add_spares' prevents an additional mutex operation.
drivers/md/md.h +2 -2
@@ -506,7 +506,7 @@ static inline char * mdname (struct mddestatic inline int sysfs_link_rdev (struct mddev *mddev,struct md_rdev *rdev) {char nm[20 ]; -if (!test_bit (Replacement, &rdev->flags)) { +if (!test_bit (Replacement, &rdev->flags) && mddev->kobj.sd) {sprintf (nm,"rd%d" , rdev->raid_disk);return sysfs_create_link (&mddev->kobj, &rdev->kobj, nm); }else
@@ -516,7 +516,7 @@ static inline int sysfs_link_rdev(structstatic inline void sysfs_unlink_rdev (struct mddev *mddev,struct md_rdev *rdev) {char nm[20 ]; -if (!test_bit (Replacement, &rdev->flags)) { +if (!test_bit (Replacement, &rdev->flags) && mddev->kobj.sd) {sprintf (nm,"rd%d" , rdev->raid_disk);sysfs_remove_link (&mddev->kobj, nm); }
drivers/md/md.c +2 -4
@@ -7646,10 +7646,8 @@ static int remove_and_add_spares(struct removed++; } } -if (removed) -sysfs_notify (&mddev->kobj,NULL , -"degraded" ); - +if (removed && mddev->kobj.sd) +sysfs_notify (&mddev->kobj,NULL ,"degraded" );rdev_for_each (rdev, mddev) { if (rdev->raid_disk >= 0 &&
NeilBrown
AppliedQuoted 42 lines · On Thu, 07 Mar 2013 16:24:26 -0600 Jonathan Brassow <[email protected]> wrote:
MD: Prevent sysfs operations on uninitialized kobjects
Device-mapper does not use sysfs; but when device-mapper is leveraging MD's RAID personalities, MD sometimes attempts to update sysfs. This patch adds checks for 'mddev-kobj.sd' in sysfs_[un]link_rdev to ensure it is about to operate on something valid. This patch also checks for '
mddev->kobj.sd' before calling 'sysfs_notify' in 'remove_and_add_spares'. Although 'sysfs_notify' already makes this check, doing so in 'remove_and_add_spares' prevents an additional mutex operation.Signed-off-by Jonathan Brassow <[email protected]>Index:
linux-upstream/drivers/md/md.h
===================================================================drivers/md/md.h +2
-2@@ -506,7 +506,7 @@ static inline char * mdname (struct mddestatic inline int sysfs_link_rdev (struct mddev *mddev,struct md_rdev *rdev) {char nm[20 ]; -if (!test_bit (Replacement, &rdev->flags)) { +if (!test_bit (Replacement, &rdev->flags) && mddev->kobj.sd) {sprintf (nm,"rd%d" , rdev->raid_disk);return sysfs_create_link (&mddev->kobj, &rdev->kobj, nm); }else @@ -516,7 +516,7 @@ static inline int sysfs_link_rdev(structstatic inline void sysfs_unlink_rdev (struct mddev *mddev,struct md_rdev *rdev) {char nm[20 ]; -if (!test_bit (Replacement, &rdev->flags)) { +if (!test_bit (Replacement, &rdev->flags) && mddev->kobj.sd) {sprintf (nm,"rd%d" , rdev->raid_disk);sysfs_remove_link (&mddev->kobj, nm); }Index:
linux-upstream/drivers/md/md.c
===================================================================drivers/md/md.c +0
-0@@ -7646,10 +7646,8 @@ static int remove_and_add_spares(struct removed++; }
drivers/md/md.c static int remove_and_add_spares(struct · line 7653
Quoted 10 lines
drivers/md/md.c +2
-4} -if (removed) -sysfs_notify (&mddev->kobj,NULL , -"degraded" ); - +if (removed && mddev->kobj.sd) +sysfs_notify (&mddev->kobj,NULL ,"degraded" );rdev_for_each (rdev, mddev) { if (rdev->raid_disk >= 0 &&
Applied, thanks.
NeilBrown