security: Introduce security_settime64()

security_settime() uses a timespec, which is not year 2038 safe
on 32bit systems. Thus this patch introduces the security_settime64()
function with timespec64 type. We also convert the cap_settime() helper
function to use the 64bit types.

This patch then moves security_settime() to the header file as an
inline helper function so that existing users can be iteratively
converted.

None of the existing hooks is using the timespec argument and therefor
the patch is not making any functional changes.

Cc: Serge Hallyn <serge.hallyn@canonical.com>,
Cc: James Morris <james.l.morris@oracle.com>,
Cc: "Serge E. Hallyn" <serge@hallyn.com>,
Cc: Paul Moore <pmoore@redhat.com>
Cc: Stephen Smalley <sds@tycho.nsa.gov>
Cc: Kees Cook <keescook@chromium.org>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@kernel.org>
Reviewed-by: James Morris <james.l.morris@oracle.com>
Signed-off-by: Baolin Wang <baolin.wang@linaro.org>
[jstultz: Reworded commit message]
Signed-off-by: John Stultz <john.stultz@linaro.org>

diff --git a/include/linux/lsm_hooks.h b/include/linux/lsm_hooks.h
index cdee11cbcdf1487a7cd99d0f58a3c348e4b118d0..41ab4662f95c715db44593effba2db0f0022f052 100644 (file)
--- a/include/linux/lsm_hooks.h
+++ b/include/linux/lsm_hooks.h
@@ -1190,7 +1190,8 @@
  *     Return 0 if permission is granted.
  * @settime:
  *     Check permission to change the system time.
- *     struct timespec and timezone are defined in include/linux/time.h
+ *     struct timespec64 is defined in include/linux/time64.h and timezone
+ *     is defined in include/linux/time.h
  *     @ts contains new time
  *     @tz contains new timezone
  *     Return 0 if permission is granted.
@@ -1327,7 +1328,7 @@ union security_list_options {
        int (*quotactl)(int cmds, int type, int id, struct super_block *sb);
        int (*quota_on)(struct dentry *dentry);
        int (*syslog)(int type);
-       int (*settime)(const struct timespec *ts, const struct timezone *tz);
+       int (*settime)(const struct timespec64 *ts, const struct timezone *tz);
        int (*vm_enough_memory)(struct mm_struct *mm, long pages);
 
        int (*bprm_set_creds)(struct linux_binprm *bprm);

diff --git a/include/linux/security.h b/include/linux/security.h
index 157f0cb1e4d2f9a6116b81d517093ec914b853a7..35ac8d9d4739d9eee29efd17c3b98d0977cb55a9 100644 (file)
--- a/include/linux/security.h
+++ b/include/linux/security.h
@@ -71,7 +71,7 @@ struct timezone;
 /* These functions are in security/commoncap.c */
 extern int cap_capable(const struct cred *cred, struct user_namespace *ns,
                       int cap, int audit);
-extern int cap_settime(const struct timespec *ts, const struct timezone *tz);
+extern int cap_settime(const struct timespec64 *ts, const struct timezone *tz);
 extern int cap_ptrace_access_check(struct task_struct *child, unsigned int mode);
 extern int cap_ptrace_traceme(struct task_struct *parent);
 extern int cap_capget(struct task_struct *target, kernel_cap_t *effective, kernel_cap_t *inheritable, kernel_cap_t *permitted);
@@ -208,7 +208,13 @@ int security_capable_noaudit(const struct cred *cred, struct user_namespace *ns,
 int security_quotactl(int cmds, int type, int id, struct super_block *sb);
 int security_quota_on(struct dentry *dentry);
 int security_syslog(int type);
-int security_settime(const struct timespec *ts, const struct timezone *tz);
+int security_settime64(const struct timespec64 *ts, const struct timezone *tz);
+static inline int security_settime(const struct timespec *ts, const struct timezone *tz)
+{
+       struct timespec64 ts64 = timespec_to_timespec64(*ts);
+
+       return security_settime64(&ts64, tz);
+}
 int security_vm_enough_memory_mm(struct mm_struct *mm, long pages);
 int security_bprm_set_creds(struct linux_binprm *bprm);
 int security_bprm_check(struct linux_binprm *bprm);
@@ -462,10 +468,18 @@ static inline int security_syslog(int type)
        return 0;
 }
 
+static inline int security_settime64(const struct timespec64 *ts,
+                                    const struct timezone *tz)
+{
+       return cap_settime(ts, tz);
+}
+
 static inline int security_settime(const struct timespec *ts,
                                   const struct timezone *tz)
 {
-       return cap_settime(ts, tz);
+       struct timespec64 ts64 = timespec_to_timespec64(*ts);
+
+       return cap_settime(&ts64, tz);
 }
 
 static inline int security_vm_enough_memory_mm(struct mm_struct *mm, long pages)

diff --git a/security/commoncap.c b/security/commoncap.c
index 48071ed7c445d025fa4ae57c12f032bfa916521f..2074bf6a2fe3d98d029215e656d781b65c90f43f 100644 (file)
--- a/security/commoncap.c
+++ b/security/commoncap.c
@@ -111,7 +111,7 @@ int cap_capable(const struct cred *cred, struct user_namespace *targ_ns,
  * Determine whether the current process may set the system clock and timezone
  * information, returning 0 if permission granted, -ve if denied.
  */
-int cap_settime(const struct timespec *ts, const struct timezone *tz)
+int cap_settime(const struct timespec64 *ts, const struct timezone *tz)
 {
        if (!capable(CAP_SYS_TIME))
                return -EPERM;

diff --git a/security/security.c b/security/security.c
index 3644b0344d29f3a17ef4f94b1156c9dffff02e65..8c44a64f191d56df9fe93305e7b463b61974f731 100644 (file)
--- a/security/security.c
+++ b/security/security.c
@@ -208,7 +208,7 @@ int security_syslog(int type)
        return call_int_hook(syslog, 0, type);
 }
 
-int security_settime(const struct timespec *ts, const struct timezone *tz)
+int security_settime64(const struct timespec64 *ts, const struct timezone *tz)
 {
        return call_int_hook(settime, 0, ts, tz);
 }