adulau/aha
1
0
Fork 0
mirror of https://github.com/adulau/aha.git synced 2024-12-28 11:46:19 +00:00
Code Issues Projects Releases Packages Wiki Activity

[PATCH] Pass dentry, not just name, in fsnotify creation hooks.

Browse source 
The audit hooks (to be added shortly) will want to see dentry->d_inode
too, not just the name.

Signed-off-by: Amy Griffis <amy.griffis@hp.com>
Signed-off-by: David Woodhouse <dwmw2@infradead.org>
This commit is contained in:
Amy Griffis 2005-11-03 15:57:06 +00:00 committed by Al Viro
parent 90d526c074
commit f38aa94224
3 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
fs/namei.c
View file

@ -1472,7 +1472,7 @@ int vfs_create(struct inode *dir, struct dentry *dentry, int mode,
DQUOT_INIT(dir); DQUOT_INIT(dir);
error = dir->i_op->create(dir, dentry, mode, nd); error = dir->i_op->create(dir, dentry, mode, nd);
if (!error) if (!error)
fsnotify_create(dir, dentry->d_name.name); fsnotify_create(dir, dentry);
return error; return error;
} }
@ -1793,7 +1793,7 @@ int vfs_mknod(struct inode *dir, struct dentry *dentry, int mode, dev_t dev)
DQUOT_INIT(dir); DQUOT_INIT(dir);
error = dir->i_op->mknod(dir, dentry, mode, dev); error = dir->i_op->mknod(dir, dentry, mode, dev);
if (!error) if (!error)
fsnotify_create(dir, dentry->d_name.name); fsnotify_create(dir, dentry);
return error; return error;
} }
@ -1870,7 +1870,7 @@ int vfs_mkdir(struct inode *dir, struct dentry *dentry, int mode)
DQUOT_INIT(dir); DQUOT_INIT(dir);
error = dir->i_op->mkdir(dir, dentry, mode); error = dir->i_op->mkdir(dir, dentry, mode);
if (!error) if (!error)
fsnotify_mkdir(dir, dentry->d_name.name); fsnotify_mkdir(dir, dentry);
return error; return error;
} }
@ -2133,7 +2133,7 @@ int vfs_symlink(struct inode *dir, struct dentry *dentry, const char *oldname, i
DQUOT_INIT(dir); DQUOT_INIT(dir);
error = dir->i_op->symlink(dir, dentry, oldname); error = dir->i_op->symlink(dir, dentry, oldname);
if (!error) if (!error)
fsnotify_create(dir, dentry->d_name.name); fsnotify_create(dir, dentry);
return error; return error;
} }
@ -2210,7 +2210,7 @@ int vfs_link(struct dentry *old_dentry, struct inode *dir, struct dentry *new_de
error = dir->i_op->link(old_dentry, dir, new_dentry); error = dir->i_op->link(old_dentry, dir, new_dentry);
mutex_unlock(&old_dentry->d_inode->i_mutex); mutex_unlock(&old_dentry->d_inode->i_mutex);
if (!error) if (!error)
fsnotify_create(dir, new_dentry->d_name.name); fsnotify_create(dir, new_dentry);
return error; return error;
} }

9
include/linux/fsnotify.h
View file

@ -70,19 +70,20 @@ static inline void fsnotify_inoderemove(struct inode *inode)
/* /*
* fsnotify_create - 'name' was linked in * fsnotify_create - 'name' was linked in
*/ */
static inline void fsnotify_create(struct inode *inode, const char *name) static inline void fsnotify_create(struct inode *inode, struct dentry *dentry)
{ {
inode_dir_notify(inode, DN_CREATE); inode_dir_notify(inode, DN_CREATE);
inotify_inode_queue_event(inode, IN_CREATE, 0, name); inotify_inode_queue_event(inode, IN_CREATE, 0, dentry->d_name.name);
} }
/* /*
* fsnotify_mkdir - directory 'name' was created * fsnotify_mkdir - directory 'name' was created
*/ */
static inline void fsnotify_mkdir(struct inode *inode, const char *name) static inline void fsnotify_mkdir(struct inode *inode, struct dentry *dentry)
{ {
inode_dir_notify(inode, DN_CREATE); inode_dir_notify(inode, DN_CREATE);
inotify_inode_queue_event(inode, IN_CREATE | IN_ISDIR, 0, name); inotify_inode_queue_event(inode, IN_CREATE | IN_ISDIR, 0,
dentry->d_name.name);
} }
/* /*

2
kernel/auditsc.c
View file

@ -515,7 +515,7 @@ static int audit_filter_rules(struct task_struct *tsk,
case AUDIT_INODE: case AUDIT_INODE:
if (ctx) { if (ctx) {
for (j = 0; j < ctx->name_count; j++) { for (j = 0; j < ctx->name_count; j++) {
if (audit_comparator(ctx->names[j].ino, op, value)) { if ( audit_comparator(ctx->names[j].ino, op, value)) {
++result; ++result;
break; break;
} }