Commit 7c0ff870 authored by Eric W. Biederman's avatar Eric W. Biederman Committed by Greg Kroah-Hartman

sysfs: sysfs_sd_setattr set iattrs unconditionally

There is currently a bug in sysfs_sd_setattr inherited from
sysfs_setattr in 2.6.32 where the first time we set the attributes
on a sysfs file we allocate backing store but do not set the
backing store attributes.  Resulting in overly restrictive
permissions on sysfs files.

The fix is to simply modify the code so that it always executes
when we update the sysfs attributes, as we did in 2.6.31 and earlier.
Signed-off-by: default avatarEric W. Biederman <ebiederm@xmission.com>
Tested-by: default avatarJean Delvare <khali@linux-fr.org>
Cc: stable <stable@kernel.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 0813e22d
...@@ -81,24 +81,23 @@ int sysfs_sd_setattr(struct sysfs_dirent *sd, struct iattr * iattr) ...@@ -81,24 +81,23 @@ int sysfs_sd_setattr(struct sysfs_dirent *sd, struct iattr * iattr)
if (!sd_attrs) if (!sd_attrs)
return -ENOMEM; return -ENOMEM;
sd->s_iattr = sd_attrs; sd->s_iattr = sd_attrs;
} else { }
/* attributes were changed at least once in past */ /* attributes were changed at least once in past */
iattrs = &sd_attrs->ia_iattr; iattrs = &sd_attrs->ia_iattr;
if (ia_valid & ATTR_UID) if (ia_valid & ATTR_UID)
iattrs->ia_uid = iattr->ia_uid; iattrs->ia_uid = iattr->ia_uid;
if (ia_valid & ATTR_GID) if (ia_valid & ATTR_GID)
iattrs->ia_gid = iattr->ia_gid; iattrs->ia_gid = iattr->ia_gid;
if (ia_valid & ATTR_ATIME) if (ia_valid & ATTR_ATIME)
iattrs->ia_atime = iattr->ia_atime; iattrs->ia_atime = iattr->ia_atime;
if (ia_valid & ATTR_MTIME) if (ia_valid & ATTR_MTIME)
iattrs->ia_mtime = iattr->ia_mtime; iattrs->ia_mtime = iattr->ia_mtime;
if (ia_valid & ATTR_CTIME) if (ia_valid & ATTR_CTIME)
iattrs->ia_ctime = iattr->ia_ctime; iattrs->ia_ctime = iattr->ia_ctime;
if (ia_valid & ATTR_MODE) { if (ia_valid & ATTR_MODE) {
umode_t mode = iattr->ia_mode; umode_t mode = iattr->ia_mode;
iattrs->ia_mode = sd->s_mode = mode; iattrs->ia_mode = sd->s_mode = mode;
}
} }
return 0; return 0;
} }
......
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