aboutsummaryrefslogtreecommitdiffstats
path: root/security
diff options
context:
space:
mode:
Diffstat (limited to 'security')
-rw-r--r--security/capability.c4
-rw-r--r--security/security.c4
-rw-r--r--security/selinux/hooks.c4
-rw-r--r--security/smack/smack_lsm.c3
4 files changed, 6 insertions, 9 deletions
diff --git a/security/capability.c b/security/capability.c
index a74fde6a7468..d68c57a62bcf 100644
--- a/security/capability.c
+++ b/security/capability.c
@@ -343,9 +343,9 @@ static int cap_file_fcntl(struct file *file, unsigned int cmd,
343 return 0; 343 return 0;
344} 344}
345 345
346static int cap_file_set_fowner(struct file *file) 346static void cap_file_set_fowner(struct file *file)
347{ 347{
348 return 0; 348 return;
349} 349}
350 350
351static int cap_file_send_sigiotask(struct task_struct *tsk, 351static int cap_file_send_sigiotask(struct task_struct *tsk,
diff --git a/security/security.c b/security/security.c
index e41b1a8d7644..18b35c63fc0c 100644
--- a/security/security.c
+++ b/security/security.c
@@ -775,9 +775,9 @@ int security_file_fcntl(struct file *file, unsigned int cmd, unsigned long arg)
775 return security_ops->file_fcntl(file, cmd, arg); 775 return security_ops->file_fcntl(file, cmd, arg);
776} 776}
777 777
778int security_file_set_fowner(struct file *file) 778void security_file_set_fowner(struct file *file)
779{ 779{
780 return security_ops->file_set_fowner(file); 780 security_ops->file_set_fowner(file);
781} 781}
782 782
783int security_file_send_sigiotask(struct task_struct *tsk, 783int security_file_send_sigiotask(struct task_struct *tsk,
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index b0e940497e23..ada0d0bf3463 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -3346,14 +3346,12 @@ static int selinux_file_fcntl(struct file *file, unsigned int cmd,
3346 return err; 3346 return err;
3347} 3347}
3348 3348
3349static int selinux_file_set_fowner(struct file *file) 3349static void selinux_file_set_fowner(struct file *file)
3350{ 3350{
3351 struct file_security_struct *fsec; 3351 struct file_security_struct *fsec;
3352 3352
3353 fsec = file->f_security; 3353 fsec = file->f_security;
3354 fsec->fown_sid = current_sid(); 3354 fsec->fown_sid = current_sid();
3355
3356 return 0;
3357} 3355}
3358 3356
3359static int selinux_file_send_sigiotask(struct task_struct *tsk, 3357static int selinux_file_send_sigiotask(struct task_struct *tsk,
diff --git a/security/smack/smack_lsm.c b/security/smack/smack_lsm.c
index e6ab307ce86e..69e5635d89e5 100644
--- a/security/smack/smack_lsm.c
+++ b/security/smack/smack_lsm.c
@@ -1390,12 +1390,11 @@ static int smack_mmap_file(struct file *file,
1390 * Returns 0 1390 * Returns 0
1391 * Further research may be required on this one. 1391 * Further research may be required on this one.
1392 */ 1392 */
1393static int smack_file_set_fowner(struct file *file) 1393static void smack_file_set_fowner(struct file *file)
1394{ 1394{
1395 struct smack_known *skp = smk_of_current(); 1395 struct smack_known *skp = smk_of_current();
1396 1396
1397 file->f_security = skp->smk_known; 1397 file->f_security = skp->smk_known;
1398 return 0;
1399} 1398}
1400 1399
1401/** 1400/**