Commit 8d334acd authored by Al Viro's avatar Al Viro
Browse files

switch is_sxid() to umode_t 



Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 62bb1091

fs/attr.c

+2 −2
Original line number Diff line number Diff line
@@ -166,7 +166,7 @@ EXPORT_SYMBOL(setattr_copy); 
int notify_change(struct dentry * dentry, struct iattr * attr)

{

	struct inode *inode = dentry->d_inode;

	mode_t mode = inode->i_mode;

	umode_t mode = inode->i_mode;

	int error;

	struct timespec now;

	unsigned int ia_valid = attr->ia_valid;
@@ -177,7 +177,7 @@ int notify_change(struct dentry * dentry, struct iattr * attr) 
	}



	if ((ia_valid & ATTR_MODE)) {

		mode_t amode = attr->ia_mode;

		umode_t amode = attr->ia_mode;

		/* Flag setting protected by i_mutex */

		if (is_sxid(amode))

			inode->i_flags &= ~S_NOSEC;

include/linux/fs.h

+1 −1
Original line number Diff line number Diff line
@@ -2690,7 +2690,7 @@ int __init get_filesystem_list(char *buf); 
#define OPEN_FMODE(flag) ((__force fmode_t)(((flag + 1) & O_ACCMODE) | \

					    (flag & __FMODE_NONOTIFY)))



static inline int is_sxid(mode_t mode)

static inline int is_sxid(umode_t mode)

{

	return (mode & S_ISUID) || ((mode & S_ISGID) && (mode & S_IXGRP));

}

CRA Git | Maintained and supported by SUSTech CRA and CCSE