Attachment 148345 Details for Bug 223919 – LSPP.65 kernel patch for this issue.

[patch] LSPP.65 kernel patch for this issue.

3.223919.patch (text/plain), 3.87 KB, created by Eric Paris on 2007-02-19 17:18:28 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Paris

Created: 2007-02-19 17:18:28 UTC

Size: 3.87 KB

patch

obsolete

>--- linux-2.6.18.i686/kernel/auditsc.c.pre.223919	2007-02-15 17:42:39.000000000 -0500
>+++ linux-2.6.18.i686/kernel/auditsc.c	2007-02-15 17:50:05.000000000 -0500
>@@ -1401,33 +1401,6 @@ update_context:
> 	}
> }
> 
>-/**
>- * audit_inode_update - update inode info for last collected name
>- * @inode: inode being audited
>- *
>- * When open() is called on an existing object with the O_CREAT flag, the inode
>- * data audit initially collects is incorrect.  This additional hook ensures
>- * audit has the inode data for the actual object to be opened.
>- */
>-void __audit_inode_update(const struct inode *inode)
>-{
>-	struct audit_context *context = current->audit_context;
>-	int idx;
>-
>-	if (!context->in_syscall || !inode)
>-		return;
>-
>-	if (context->name_count == 0) {
>-		context->name_count++;
>-#if AUDIT_DEBUG
>-		context->ino_count++;
>-#endif
>-	}
>-	idx = context->name_count - 1;
>-
>-	audit_copy_inode(&context->names[idx], inode);
>-}
>-
> EXPORT_SYMBOL_GPL(__audit_inode_child);
> 
> /**
>--- linux-2.6.18.i686/fs/namei.c.pre.223919	2007-02-15 17:30:39.000000000 -0500
>+++ linux-2.6.18.i686/fs/namei.c	2007-02-15 17:44:03.000000000 -0500
>@@ -1693,7 +1693,7 @@ do_last:
> 	 * It already exists.
> 	 */
> 	mutex_unlock(&dir->d_inode->i_mutex);
>-	audit_inode_update(path.dentry->d_inode);
>+	audit_inode(pathname, path.dentry->d_inode);
> 
> 	error = -EEXIST;
> 	if (flag & O_EXCL)
>--- linux-2.6.18.i686/ipc/mqueue.c.pre.223919	2007-02-15 17:30:36.000000000 -0500
>+++ linux-2.6.18.i686/ipc/mqueue.c	2007-02-15 17:44:03.000000000 -0500
>@@ -680,6 +680,7 @@ asmlinkage long sys_mq_open(const char _
> 
> 	if (oflag & O_CREAT) {
> 		if (dentry->d_inode) {	/* entry already exists */
>+        		audit_inode(name, dentry->d_inode);
> 			error = -EEXIST;
> 			if (oflag & O_EXCL)
> 				goto out;
>@@ -692,6 +693,7 @@ asmlinkage long sys_mq_open(const char _
> 		error = -ENOENT;
> 		if (!dentry->d_inode)
> 			goto out;
>+        	audit_inode(name, dentry->d_inode);
> 		filp = do_open(dentry, oflag);
> 	}
> 
>@@ -838,6 +840,7 @@ asmlinkage long sys_mq_timedsend(mqd_t m
> 	if (unlikely(filp->f_op != &mqueue_file_operations))
> 		goto out_fput;
> 	info = MQUEUE_I(inode);
>+	audit_inode(NULL, inode);
> 
> 	if (unlikely(!(filp->f_mode & FMODE_WRITE)))
> 		goto out_fput;
>@@ -921,6 +924,7 @@ asmlinkage ssize_t sys_mq_timedreceive(m
> 	if (unlikely(filp->f_op != &mqueue_file_operations))
> 		goto out_fput;
> 	info = MQUEUE_I(inode);
>+	audit_inode(NULL, inode);
> 
> 	if (unlikely(!(filp->f_mode & FMODE_READ)))
> 		goto out_fput;
>--- linux-2.6.18.i686/include/linux/audit.h.pre.223919	2007-02-15 17:30:46.000000000 -0500
>+++ linux-2.6.18.i686/include/linux/audit.h	2007-02-15 17:44:03.000000000 -0500
>@@ -349,7 +349,6 @@ extern void audit_putname(const char *na
> extern void __audit_inode(const char *name, const struct inode *inode);
> extern void __audit_inode_child(const char *dname, const struct inode *inode,
> 				const struct inode *parent);
>-extern void __audit_inode_update(const struct inode *inode);
> static inline int audit_dummy_context(void)
> {
> 	void *p = current->audit_context;
>@@ -370,10 +369,6 @@ static inline void audit_inode_child(con
> 	if (unlikely(!audit_dummy_context()))
> 		__audit_inode_child(dname, inode, parent);
> }
>-static inline void audit_inode_update(const struct inode *inode) {
>-	if (unlikely(!audit_dummy_context()))
>-		__audit_inode_update(inode);
>-}
> 
> 				/* Private API (for audit.c only) */
> extern unsigned int audit_serial(void);
>@@ -448,10 +443,8 @@ extern int audit_n_rules;
> #define audit_putname(n) do { ; } while (0)
> #define __audit_inode(n,i) do { ; } while (0)
> #define __audit_inode_child(d,i,p) do { ; } while (0)
>-#define __audit_inode_update(i) do { ; } while (0)
> #define audit_inode(n,i) do { ; } while (0)
> #define audit_inode_child(d,i,p) do { ; } while (0)
>-#define audit_inode_update(i) do { ; } while (0)
> #define auditsc_get_stamp(c,t,s) do { BUG(); } while (0)
> #define audit_get_loginuid(c) ({ -1; })
> #define audit_log_task_context(b) do { ; } while (0)

Actions: View | Diff

Attachments on bug 223919: 146376 | 148345