sysfs: sysfs_sd_setattr set iattrs unconditionally

commit 7c0ff870 upstream.

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: Eric W. Biederman <ebiederm@xmission.com>
Tested-by: Jean Delvare <khali@linux-fr.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

fs/sysfs/inode.c

@@ -94,7 +94,7 @@ int sysfs_setattr(struct dentry * dentry, struct iattr * iattr)
 		if (!sd_attrs)
 			return -ENOMEM;
 		sd->s_iattr = sd_attrs;
-	} else {
+	}
 	/* attributes were changed at least once in past */
 	iattrs = &sd_attrs->ia_iattr;
 
@@ -118,7 +118,6 @@ int sysfs_setattr(struct dentry * dentry, struct iattr * iattr)
 			mode &= ~S_ISGID;
 		iattrs->ia_mode = sd->s_mode = mode;
 	}
-	}
 	return error;
 }