diff options
Diffstat (limited to 'security')
| -rw-r--r-- | security/selinux/avc.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/security/selinux/avc.c b/security/selinux/avc.c index ecd067384531..0e69adf63bdb 100644 --- a/security/selinux/avc.c +++ b/security/selinux/avc.c | |||
| @@ -570,10 +570,12 @@ void avc_audit(u32 ssid, u32 tsid, | |||
| 570 | case AVC_AUDIT_DATA_FS: | 570 | case AVC_AUDIT_DATA_FS: |
| 571 | if (a->u.fs.dentry) { | 571 | if (a->u.fs.dentry) { |
| 572 | struct dentry *dentry = a->u.fs.dentry; | 572 | struct dentry *dentry = a->u.fs.dentry; |
| 573 | if (a->u.fs.mnt) | 573 | if (a->u.fs.mnt) { |
| 574 | audit_avc_path(dentry, a->u.fs.mnt); | 574 | audit_log_d_path(ab, "path=", dentry, a->u.fs.mnt); |
| 575 | audit_log_format(ab, " name="); | 575 | } else { |
| 576 | audit_log_untrustedstring(ab, dentry->d_name.name); | 576 | audit_log_format(ab, " name="); |
| 577 | audit_log_untrustedstring(ab, dentry->d_name.name); | ||
| 578 | } | ||
| 577 | inode = dentry->d_inode; | 579 | inode = dentry->d_inode; |
| 578 | } else if (a->u.fs.inode) { | 580 | } else if (a->u.fs.inode) { |
| 579 | struct dentry *dentry; | 581 | struct dentry *dentry; |
| @@ -624,9 +626,8 @@ void avc_audit(u32 ssid, u32 tsid, | |||
| 624 | case AF_UNIX: | 626 | case AF_UNIX: |
| 625 | u = unix_sk(sk); | 627 | u = unix_sk(sk); |
| 626 | if (u->dentry) { | 628 | if (u->dentry) { |
| 627 | audit_avc_path(u->dentry, u->mnt); | 629 | audit_log_d_path(ab, "path=", |
| 628 | audit_log_format(ab, " name="); | 630 | u->dentry, u->mnt); |
| 629 | audit_log_untrustedstring(ab, u->dentry->d_name.name); | ||
| 630 | break; | 631 | break; |
| 631 | } | 632 | } |
| 632 | if (!u->addr) | 633 | if (!u->addr) |