diff options
Diffstat (limited to 'kernel/auditfilter.c')
-rw-r--r-- | kernel/auditfilter.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/kernel/auditfilter.c b/kernel/auditfilter.c index 6f19fd477aac..a36e66797c3d 100644 --- a/kernel/auditfilter.c +++ b/kernel/auditfilter.c | |||
@@ -169,8 +169,8 @@ static struct audit_parent *audit_init_parent(struct nameidata *ndp) | |||
169 | inotify_init_watch(&parent->wdata); | 169 | inotify_init_watch(&parent->wdata); |
170 | /* grab a ref so inotify watch hangs around until we take audit_filter_mutex */ | 170 | /* grab a ref so inotify watch hangs around until we take audit_filter_mutex */ |
171 | get_inotify_watch(&parent->wdata); | 171 | get_inotify_watch(&parent->wdata); |
172 | wd = inotify_add_watch(audit_ih, &parent->wdata, ndp->dentry->d_inode, | 172 | wd = inotify_add_watch(audit_ih, &parent->wdata, |
173 | AUDIT_IN_WATCH); | 173 | ndp->path.dentry->d_inode, AUDIT_IN_WATCH); |
174 | if (wd < 0) { | 174 | if (wd < 0) { |
175 | audit_free_parent(&parent->wdata); | 175 | audit_free_parent(&parent->wdata); |
176 | return ERR_PTR(wd); | 176 | return ERR_PTR(wd); |
@@ -1214,8 +1214,8 @@ static int audit_add_watch(struct audit_krule *krule, struct nameidata *ndp, | |||
1214 | 1214 | ||
1215 | /* update watch filter fields */ | 1215 | /* update watch filter fields */ |
1216 | if (ndw) { | 1216 | if (ndw) { |
1217 | watch->dev = ndw->dentry->d_inode->i_sb->s_dev; | 1217 | watch->dev = ndw->path.dentry->d_inode->i_sb->s_dev; |
1218 | watch->ino = ndw->dentry->d_inode->i_ino; | 1218 | watch->ino = ndw->path.dentry->d_inode->i_ino; |
1219 | } | 1219 | } |
1220 | 1220 | ||
1221 | /* The audit_filter_mutex must not be held during inotify calls because | 1221 | /* The audit_filter_mutex must not be held during inotify calls because |
@@ -1225,7 +1225,8 @@ static int audit_add_watch(struct audit_krule *krule, struct nameidata *ndp, | |||
1225 | */ | 1225 | */ |
1226 | mutex_unlock(&audit_filter_mutex); | 1226 | mutex_unlock(&audit_filter_mutex); |
1227 | 1227 | ||
1228 | if (inotify_find_watch(audit_ih, ndp->dentry->d_inode, &i_watch) < 0) { | 1228 | if (inotify_find_watch(audit_ih, ndp->path.dentry->d_inode, |
1229 | &i_watch) < 0) { | ||
1229 | parent = audit_init_parent(ndp); | 1230 | parent = audit_init_parent(ndp); |
1230 | if (IS_ERR(parent)) { | 1231 | if (IS_ERR(parent)) { |
1231 | /* caller expects mutex locked */ | 1232 | /* caller expects mutex locked */ |