From patchwork Sat Aug 13 22:48:31 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Deepa Dinamani X-Patchwork-Id: 9279363 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id A606760780 for ; Sun, 14 Aug 2016 11:52:46 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9639128A06 for ; Sun, 14 Aug 2016 11:52:46 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8B08628A57; Sun, 14 Aug 2016 11:52:46 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,FREEMAIL_FROM,RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D0D0F28A06 for ; Sun, 14 Aug 2016 11:52:45 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965224AbcHNLbB (ORCPT ); Sun, 14 Aug 2016 07:31:01 -0400 Received: from mail-pa0-f66.google.com ([209.85.220.66]:32790 "EHLO mail-pa0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934116AbcHNLa6 (ORCPT ); Sun, 14 Aug 2016 07:30:58 -0400 Received: by mail-pa0-f66.google.com with SMTP id vy10so2070996pac.0; Sun, 14 Aug 2016 04:30:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=th89WjLndPdPCq5aWNiIHlQS8x2g7v56G/Dkun2Eutk=; b=JmJhBKpNoBXU7Lj1hBgniaKkqcqOV+XuMs86SgoHFJEe1nTQaX11rWyWELNrmo8N7n //uZCYQ034ffkp/7Jpkt+YaI5FBtzMks2ugH/+9jOzZkVTYdvS4BsvQCeS996Q/uIUCg LJRA0fmX7ErEEO3sZzEeKPwWWcL4F8Hr1yVHbeHTtago1YqAck/5Lmh5FiOGACsgYqc0 3pB8Y9kvptVLc9HUZAcyX7ju41hZ1fV9CpI3j5LJyr+tntCukh2c5kl21vyikSWjCqhx Q1cI7bCPJ12EDrtYR6z/QjNFm6dGOHNyrvT5w4ffiZP2qtA1rYRZtbq/nFnl/BbXWko/ L+FQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=th89WjLndPdPCq5aWNiIHlQS8x2g7v56G/Dkun2Eutk=; b=mzmzq4soezGmP50bEm8lk4JMfXdUTAK8JSZxlGZR2GWyG7klBmN1eceoJWk845/yro d7U3mYW+zM6CldtfEQOJ7HNXeHJy0tuXIl3Xs/RVr9t3nKGATuQwtkhok5CWgZyu4R4D CrpP6Wgr96x9CLXz4gb3iMxkoaERZDG6iqUXA6ZSK4zJ//kqXIl1XYkXACTcmPoheGdh u4X+fLbblfDXUka+BQU2Uet7h8ew4mrQ/qJycIcR6gERSlJW8Q/dtIXQyME6XqlIt3I+ yDQyjrVC3U/upS76OCG/MqmzQB01qOdHFROLhQsz4ARWieDIsYecJlMky25jaCuGgyeb OPVw== X-Gm-Message-State: AEkoouscQLdgWGgXE77Abb/63K67TkrU2Q+hI2IS7bnKnvOyNaekuje7EIEIw32chwmfwg== X-Received: by 10.66.78.5 with SMTP id x5mr39756274paw.108.1471128577709; Sat, 13 Aug 2016 15:49:37 -0700 (PDT) Received: from deepa-ubuntu.hsd1.ca.comcast.net (c-73-252-251-201.hsd1.ca.comcast.net. [73.252.251.201]) by smtp.gmail.com with ESMTPSA id 81sm22528007pfm.90.2016.08.13.15.49.36 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 13 Aug 2016 15:49:37 -0700 (PDT) From: Deepa Dinamani To: linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Cc: arnd@arndb.de, tglx@linutronix.de, torvalds@linux-foundation.org, tytso@mit.edu, viro@zeniv.linux.org.uk, y2038@lists.linaro.org, Eric Paris , Paul Moore , Richard Guy Briggs , linux-audit@redhat.com Subject: [PATCH v4 19/26] audit: Use timespec64 to represent audit timestamps Date: Sat, 13 Aug 2016 15:48:31 -0700 Message-Id: <1471128518-24075-20-git-send-email-deepa.kernel@gmail.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1471128518-24075-1-git-send-email-deepa.kernel@gmail.com> References: <1471128518-24075-1-git-send-email-deepa.kernel@gmail.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP struct timespec is not y2038 safe. Audit timestamps are recorded in string format into an audit buffer for a given context. These mark the entry timestamps for the syscalls. Use y2038 safe struct timespec64 to represent the times. The log strings can handle this transition as strings can hold upto 1024 characters. Signed-off-by: Deepa Dinamani Reviewed-by: Arnd Bergmann Acked-by: Paul Moore Acked-by: Richard Guy Briggs Cc: Eric Paris Cc: Paul Moore Cc: Richard Guy Briggs Cc: linux-audit@redhat.com --- include/linux/audit.h | 4 ++-- kernel/audit.c | 10 +++++----- kernel/audit.h | 2 +- kernel/auditsc.c | 6 +++--- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/include/linux/audit.h b/include/linux/audit.h index 9d4443f..e51782b 100644 --- a/include/linux/audit.h +++ b/include/linux/audit.h @@ -332,7 +332,7 @@ static inline void audit_ptrace(struct task_struct *t) /* Private API (for audit.c only) */ extern unsigned int audit_serial(void); extern int auditsc_get_stamp(struct audit_context *ctx, - struct timespec *t, unsigned int *serial); + struct timespec64 *t, unsigned int *serial); extern int audit_set_loginuid(kuid_t loginuid); static inline kuid_t audit_get_loginuid(struct task_struct *tsk) @@ -490,7 +490,7 @@ static inline void __audit_seccomp(unsigned long syscall, long signr, int code) static inline void audit_seccomp(unsigned long syscall, long signr, int code) { } static inline int auditsc_get_stamp(struct audit_context *ctx, - struct timespec *t, unsigned int *serial) + struct timespec64 *t, unsigned int *serial) { return 0; } diff --git a/kernel/audit.c b/kernel/audit.c index a8a91bd..b03b6c7 100644 --- a/kernel/audit.c +++ b/kernel/audit.c @@ -1325,10 +1325,10 @@ unsigned int audit_serial(void) } static inline void audit_get_stamp(struct audit_context *ctx, - struct timespec *t, unsigned int *serial) + struct timespec64 *t, unsigned int *serial) { if (!ctx || !auditsc_get_stamp(ctx, t, serial)) { - *t = CURRENT_TIME; + ktime_get_real_ts64(t); *serial = audit_serial(); } } @@ -1370,7 +1370,7 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask, int type) { struct audit_buffer *ab = NULL; - struct timespec t; + struct timespec64 t; unsigned int uninitialized_var(serial); int reserve = 5; /* Allow atomic callers to go up to five entries over the normal backlog limit */ @@ -1422,8 +1422,8 @@ struct audit_buffer *audit_log_start(struct audit_context *ctx, gfp_t gfp_mask, audit_get_stamp(ab->ctx, &t, &serial); - audit_log_format(ab, "audit(%lu.%03lu:%u): ", - t.tv_sec, t.tv_nsec/1000000, serial); + audit_log_format(ab, "audit(%llu.%03lu:%u): ", + (unsigned long long)t.tv_sec, t.tv_nsec/1000000, serial); return ab; } diff --git a/kernel/audit.h b/kernel/audit.h index 431444c..55d1ca2 100644 --- a/kernel/audit.h +++ b/kernel/audit.h @@ -112,7 +112,7 @@ struct audit_context { enum audit_state state, current_state; unsigned int serial; /* serial number for record */ int major; /* syscall number */ - struct timespec ctime; /* time of syscall entry */ + struct timespec64 ctime; /* time of syscall entry */ unsigned long argv[4]; /* syscall arguments */ long return_code;/* syscall return code */ u64 prio; diff --git a/kernel/auditsc.c b/kernel/auditsc.c index 5abf1dc..8dc7fe9 100644 --- a/kernel/auditsc.c +++ b/kernel/auditsc.c @@ -1522,7 +1522,7 @@ void __audit_syscall_entry(int major, unsigned long a1, unsigned long a2, return; context->serial = 0; - context->ctime = CURRENT_TIME; + ktime_get_real_ts64(&context->ctime); context->in_syscall = 1; context->current_state = state; context->ppid = 0; @@ -1931,13 +1931,13 @@ EXPORT_SYMBOL_GPL(__audit_inode_child); /** * auditsc_get_stamp - get local copies of audit_context values * @ctx: audit_context for the task - * @t: timespec to store time recorded in the audit_context + * @t: timespec64 to store time recorded in the audit_context * @serial: serial value that is recorded in the audit_context * * Also sets the context as auditable. */ int auditsc_get_stamp(struct audit_context *ctx, - struct timespec *t, unsigned int *serial) + struct timespec64 *t, unsigned int *serial) { if (!ctx->in_syscall) return 0;