Attachment 147495 Details for Bug 223129 – Potential fix

[patch] Potential fix

diff.diff (text/plain), 3.00 KB, created by Eric Paris on 2007-02-06 17:27:06 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Eric Paris

Created: 2007-02-06 17:27:06 UTC

Size: 3.00 KB

patch

obsolete

>diff -Naupr linux-2.6.9/fs/dcache.c linux-2.6.9/fs/dcache.c
>--- linux-2.6.9/fs/dcache.c	2007-02-05 13:12:01.000000000 -0500
>+++ linux-2.6.9/fs/dcache.c	2007-02-05 13:09:36.000000000 -0500
>@@ -1292,6 +1292,7 @@ void d_move(struct dentry * dentry, stru
> 	}
> 
> 	audit_update_watch(dentry, 1);
>+	audit_update_watch(target, 1);
> 
> 	/* Move the dentry to the target hash queue, if on different bucket */
> 	if (dentry->d_flags & DCACHE_UNHASHED)
>diff -Naupr linux-2.6.9/kernel/auditfs.c linux-2.6.9/kernel/auditfs.c
>--- linux-2.6.9/kernel/auditfs.c	2007-02-05 13:11:49.000000000 -0500
>+++ linux-2.6.9/kernel/auditfs.c	2007-02-05 13:09:09.000000000 -0500
>@@ -110,7 +110,8 @@ static void audit_data_pool_shrink(void)
> 	spin_unlock(&auditfs_hash_lock);
> }
> 
>-static struct audit_inode_data *audit_data_get(struct inode *inode, int allocate)
>+static struct audit_inode_data *audit_data_get(struct inode *inode, int allocate,
>+						int remove)
> {
> 	struct audit_inode_data **list;
> 	struct audit_inode_data *ret = NULL;
>@@ -142,7 +143,7 @@ static struct audit_inode_data *audit_da
> 
> 	if (ret) {
> 		ret->count++;
>-	} else if (allocate) {
>+	} else if (allocate && !remove) {
> 		ret = audit_data_pool;
> 		audit_data_pool = ret->next_hash;
> 		audit_pool_size--;
>@@ -410,7 +411,7 @@ static inline int audit_insert_watch(str
> 	if (nd.last_type != LAST_NORM || !nd.last.name)
> 		goto release;
> 
>-	pdata = audit_data_get(nd.dentry->d_inode, 1);
>+	pdata = audit_data_get(nd.dentry->d_inode, 1, 0);
> 	if (!pdata)
> 		goto put_pdata;
> 
>@@ -478,7 +479,7 @@ static inline int audit_remove_watch(str
> 	if (nd.last_type != LAST_NORM || !nd.last.name)
> 		goto audit_remove_watch_release;
> 
>-	data = audit_data_get(nd.dentry->d_inode, 0);
>+	data = audit_data_get(nd.dentry->d_inode, 0, 1);
> 	if (!data)
> 		goto audit_remove_watch_release;
> 
>@@ -562,7 +563,7 @@ void audit_update_watch(struct dentry *d
> 
> 	/* If there's no audit data on the parent inode, then there can
> 	   be no watches to add or remove */
>-	parent = audit_data_get(dentry->d_parent->d_inode, 0);
>+	parent = audit_data_get(dentry->d_parent->d_inode, 0, 0);
> 	if (!parent)
> 		return;
> 
>@@ -571,7 +572,7 @@ void audit_update_watch(struct dentry *d
> 	/* Fetch audit data, using the preallocated one from the watch if
> 	   there is actually a relevant watch and the inode didn't already
> 	   have any audit data */
>-	data = audit_data_get(dentry->d_inode, !!watch);
>+	data = audit_data_get(dentry->d_inode, !!watch, remove);
> 
> 	/* If there's no data, then there wasn't a watch either.
> 	   Nothing to see here; move along */
>@@ -786,7 +787,7 @@ void audit_inode_free(struct inode *inod
> {
> 	struct audit_watch *watch;
> 	struct hlist_node *pos, *tmp;
>-	struct audit_inode_data *data = audit_data_get(inode, 0);
>+	struct audit_inode_data *data = audit_data_get(inode, 0, 1);
> 
> 	if (data) {
> 		spin_lock(&auditfs_hash_lock);
>@@ -851,7 +852,7 @@ void audit_notify_watch(struct inode *in
> 	if (!inode || !current->audit_context)
> 		return;
> 
>-	data = audit_data_get(inode, 0);
>+	data = audit_data_get(inode, 0, 0);
> 	if (!data)
> 		return;
>

Actions: View | Diff

Attachments on bug 223129: 145943 | 146837 | 147495