[PATCH] Remove duplicate LSM hooks in sendfile

From: Chris Wright (chris@wirex.com)
Date: Thu Feb 06 2003 - 19:13:59 EST


Hi,

Somehow the patch to restore the LSM hooks in sendfile got submitted by
Andrew twice (csets 1.974.1.7 and 1.947.32.14 in the current 2.5-bk).
This patch removes the duplication. Thanks to Stephen Rothwell for
noting this.

Thanks,
-chris

-- 
Linux Security Modules     http://lsm.immunix.org     http://lsm.bkbits.net

===== fs/read_write.c 1.27 vs edited ===== --- 1.27/fs/read_write.c Wed Feb 5 20:04:28 2003 +++ edited/fs/read_write.c Thu Feb 6 16:10:53 2003 @@ -535,10 +535,6 @@ if (retval) goto fput_in; - retval = security_file_permission (in_file, MAY_READ); - if (retval) - goto fput_in; - /* * Get output file, and verify that it is ok.. */ @@ -553,10 +549,6 @@ goto fput_out; out_inode = out_file->f_dentry->d_inode; retval = locks_verify_area(FLOCK_VERIFY_WRITE, out_inode, out_file, out_file->f_pos, count); - if (retval) - goto fput_out; - - retval = security_file_permission (out_file, MAY_WRITE); if (retval) goto fput_out; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Fri Feb 07 2003 - 22:00:22 EST