Merge tag 'ceph-for-5.11-rc1' of git://github.com/ceph/ceph-client

[linux-2.6-microblaze.git] / security / lsm_audit.c

diff --git a/security/lsm_audit.c b/security/lsm_audit.c
index 53d0d18..7d8026f 100644 (file)
--- a/security/lsm_audit.c
+++ b/security/lsm_audit.c
@@ -183,7 +183,7 @@ int ipv6_skb_to_auditdata(struct sk_buff *skb,
 
 
 static inline void print_ipv6_addr(struct audit_buffer *ab,
-                                  struct in6_addr *addr, __be16 port,
+                                  const struct in6_addr *addr, __be16 port,
                                   char *name1, char *name2)
 {
        if (!ipv6_addr_any(addr))
@@ -241,7 +241,6 @@ static void dump_common_audit_data(struct audit_buffer *ab,
                        audit_log_untrustedstring(ab, inode->i_sb->s_id);
                        audit_log_format(ab, " ino=%lu", inode->i_ino);
                }
-               audit_getcwd();
                break;
        }
        case LSM_AUDIT_DATA_FILE: {
@@ -255,7 +254,6 @@ static void dump_common_audit_data(struct audit_buffer *ab,
                        audit_log_untrustedstring(ab, inode->i_sb->s_id);
                        audit_log_format(ab, " ino=%lu", inode->i_ino);
                }
-               audit_getcwd();
                break;
        }
        case LSM_AUDIT_DATA_IOCTL_OP: {
@@ -271,7 +269,6 @@ static void dump_common_audit_data(struct audit_buffer *ab,
                }
 
                audit_log_format(ab, " ioctlcmd=0x%hx", a->u.op->cmd);
-               audit_getcwd();
                break;
        }
        case LSM_AUDIT_DATA_DENTRY: {
@@ -286,7 +283,6 @@ static void dump_common_audit_data(struct audit_buffer *ab,
                        audit_log_untrustedstring(ab, inode->i_sb->s_id);
                        audit_log_format(ab, " ino=%lu", inode->i_ino);
                }
-               audit_getcwd();
                break;
        }
        case LSM_AUDIT_DATA_INODE: {
@@ -304,7 +300,6 @@ static void dump_common_audit_data(struct audit_buffer *ab,
                audit_log_format(ab, " dev=");
                audit_log_untrustedstring(ab, inode->i_sb->s_id);
                audit_log_format(ab, " ino=%lu", inode->i_ino);
-               audit_getcwd();
                break;
        }
        case LSM_AUDIT_DATA_TASK: {
@@ -322,7 +317,7 @@ static void dump_common_audit_data(struct audit_buffer *ab,
        }
        case LSM_AUDIT_DATA_NET:
                if (a->u.net->sk) {
-                       struct sock *sk = a->u.net->sk;
+                       const struct sock *sk = a->u.net->sk;
                        struct unix_sock *u;
                        struct unix_address *addr;
                        int len = 0;