|
@@ -563,6 +563,13 @@ restart:
|
|
if (error)
|
|
if (error)
|
|
return error;
|
|
return error;
|
|
|
|
|
|
|
|
+ /* For changing security info in file_remove_privs() we need i_mutex */
|
|
|
|
+ if (*iolock == XFS_IOLOCK_SHARED && !IS_NOSEC(inode)) {
|
|
|
|
+ xfs_rw_iunlock(ip, *iolock);
|
|
|
|
+ *iolock = XFS_IOLOCK_EXCL;
|
|
|
|
+ xfs_rw_ilock(ip, *iolock);
|
|
|
|
+ goto restart;
|
|
|
|
+ }
|
|
/*
|
|
/*
|
|
* If the offset is beyond the size of the file, we need to zero any
|
|
* If the offset is beyond the size of the file, we need to zero any
|
|
* blocks that fall between the existing EOF and the start of this
|
|
* blocks that fall between the existing EOF and the start of this
|
|
@@ -623,7 +630,9 @@ restart:
|
|
* setgid bits if the process is not being run by root. This keeps
|
|
* setgid bits if the process is not being run by root. This keeps
|
|
* people from modifying setuid and setgid binaries.
|
|
* people from modifying setuid and setgid binaries.
|
|
*/
|
|
*/
|
|
- return file_remove_privs(file);
|
|
|
|
|
|
+ if (!IS_NOSEC(inode))
|
|
|
|
+ return file_remove_privs(file);
|
|
|
|
+ return 0;
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
/*
|