Merge branch 'audit.b61' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current
* 'audit.b61' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/audit-current: audit: validate comparison operations, store them in sane form clean up audit_rule_{add,del} a bit make sure that filterkey of task,always rules is reported audit rules ordering, part 2 fixing audit rule ordering mess, part 1 audit_update_lsm_rules() misses the audit_inode_hash[] ones sanitize audit_log_capset() sanitize audit_fd_pair() sanitize audit_mq_open() sanitize AUDIT_MQ_SENDRECV sanitize audit_mq_notify() sanitize audit_mq_getsetattr() sanitize audit_ipc_set_perm() sanitize audit_ipc_obj() sanitize audit_socketcall don't reallocate buffer in every audit_sockaddr()
This commit is contained in:
@@ -1016,10 +1016,7 @@ int do_pipe_flags(int *fd, int flags)
|
||||
goto err_fdr;
|
||||
fdw = error;
|
||||
|
||||
error = audit_fd_pair(fdr, fdw);
|
||||
if (error < 0)
|
||||
goto err_fdw;
|
||||
|
||||
audit_fd_pair(fdr, fdw);
|
||||
fd_install(fdr, fr);
|
||||
fd_install(fdw, fw);
|
||||
fd[0] = fdr;
|
||||
@@ -1027,8 +1024,6 @@ int do_pipe_flags(int *fd, int flags)
|
||||
|
||||
return 0;
|
||||
|
||||
err_fdw:
|
||||
put_unused_fd(fdw);
|
||||
err_fdr:
|
||||
put_unused_fd(fdr);
|
||||
err_read_pipe:
|
||||
|
Reference in New Issue
Block a user