| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <1255564307-9566-1-git-send-email-gregkh@suse.de> Date: Wed, 14 Oct 2009 16:51:46 -0700 From: Greg Kroah-Hartman <gregkh@...e.de> To: linux-kernel@...r.kernel.org Cc: Cornelia Huck <cornelia.huck@...ibm.com>, Phil Carmody <ext-phil.2.carmody@...ia.com>, Greg Kroah-Hartman <gregkh@...e.de> Subject: [PATCH 1/2] sysfs: Allow sysfs_move_dir(..., NULL) again. From: Cornelia Huck <cornelia.huck@...ibm.com> As device_move() and kobject_move() both handle a NULL destination, sysfs_move_dir() should do this as well (again) and fall back to sysfs_root in that case. Signed-off-by: Cornelia Huck <cornelia.huck@...ibm.com> Cc: Phil Carmody <ext-phil.2.carmody@...ia.com> Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de> --- fs/sysfs/dir.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/fs/sysfs/dir.c b/fs/sysfs/dir.c index 0050fc4..5fad489 100644 --- a/fs/sysfs/dir.c +++ b/fs/sysfs/dir.c @@ -894,7 +894,8 @@ int sysfs_move_dir(struct kobject *kobj, struct kobject *new_parent_kobj) mutex_lock(&sysfs_rename_mutex); BUG_ON(!sd->s_parent); - new_parent_sd = new_parent_kobj->sd ? new_parent_kobj->sd : &sysfs_root; + new_parent_sd = (new_parent_kobj && new_parent_kobj->sd) ? + new_parent_kobj->sd : &sysfs_root; error = 0; if (sd->s_parent == new_parent_sd) -- 1.6.4.2 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@...r.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists