diff options
Diffstat (limited to 'kernel/auditsc.c')
-rw-r--r-- | kernel/auditsc.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kernel/auditsc.c b/kernel/auditsc.c index aac1a41f82bd..ecc23e25c9eb 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c | |||
@@ -1235,11 +1235,11 @@ static void show_special(struct audit_context *context, int *call_panic) | |||
1235 | case AUDIT_MQ_SENDRECV: | 1235 | case AUDIT_MQ_SENDRECV: |
1236 | audit_log_format(ab, | 1236 | audit_log_format(ab, |
1237 | "mqdes=%d msg_len=%zd msg_prio=%u " | 1237 | "mqdes=%d msg_len=%zd msg_prio=%u " |
1238 | "abs_timeout_sec=%ld abs_timeout_nsec=%ld", | 1238 | "abs_timeout_sec=%lld abs_timeout_nsec=%ld", |
1239 | context->mq_sendrecv.mqdes, | 1239 | context->mq_sendrecv.mqdes, |
1240 | context->mq_sendrecv.msg_len, | 1240 | context->mq_sendrecv.msg_len, |
1241 | context->mq_sendrecv.msg_prio, | 1241 | context->mq_sendrecv.msg_prio, |
1242 | context->mq_sendrecv.abs_timeout.tv_sec, | 1242 | (long long) context->mq_sendrecv.abs_timeout.tv_sec, |
1243 | context->mq_sendrecv.abs_timeout.tv_nsec); | 1243 | context->mq_sendrecv.abs_timeout.tv_nsec); |
1244 | break; | 1244 | break; |
1245 | case AUDIT_MQ_NOTIFY: | 1245 | case AUDIT_MQ_NOTIFY: |
@@ -2083,15 +2083,15 @@ void __audit_mq_open(int oflag, umode_t mode, struct mq_attr *attr) | |||
2083 | * | 2083 | * |
2084 | */ | 2084 | */ |
2085 | void __audit_mq_sendrecv(mqd_t mqdes, size_t msg_len, unsigned int msg_prio, | 2085 | void __audit_mq_sendrecv(mqd_t mqdes, size_t msg_len, unsigned int msg_prio, |
2086 | const struct timespec *abs_timeout) | 2086 | const struct timespec64 *abs_timeout) |
2087 | { | 2087 | { |
2088 | struct audit_context *context = current->audit_context; | 2088 | struct audit_context *context = current->audit_context; |
2089 | struct timespec *p = &context->mq_sendrecv.abs_timeout; | 2089 | struct timespec64 *p = &context->mq_sendrecv.abs_timeout; |
2090 | 2090 | ||
2091 | if (abs_timeout) | 2091 | if (abs_timeout) |
2092 | memcpy(p, abs_timeout, sizeof(struct timespec)); | 2092 | memcpy(p, abs_timeout, sizeof(*p)); |
2093 | else | 2093 | else |
2094 | memset(p, 0, sizeof(struct timespec)); | 2094 | memset(p, 0, sizeof(*p)); |
2095 | 2095 | ||
2096 | context->mq_sendrecv.mqdes = mqdes; | 2096 | context->mq_sendrecv.mqdes = mqdes; |
2097 | context->mq_sendrecv.msg_len = msg_len; | 2097 | context->mq_sendrecv.msg_len = msg_len; |