Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1e6d7679 authored by Richard Cochran's avatar Richard Cochran Committed by Thomas Gleixner
Browse files

time: Correct the *settime* parameters 



Both settimeofday() and clock_settime() promise with a 'const'
attribute not to alter the arguments passed in. This patch adds the
missing 'const' attribute into the various kernel functions
implementing these calls.

Signed-off-by: default avatarRichard Cochran <richard.cochran@omicron.at>
Acked-by: default avatarJohn Stultz <johnstul@us.ibm.com>
LKML-Reference: <20110201134417.545698637@linutronix.de>
Signed-off-by: default avatarThomas Gleixner <tglx@linutronix.de>
parent 7cf37e87

drivers/char/mmtimer.c

+1 −1
Original line number Diff line number Diff line
@@ -487,7 +487,7 @@ static int sgi_clock_get(clockid_t clockid, struct timespec *tp) 
	return 0;

};



static int sgi_clock_set(clockid_t clockid, struct timespec *tp)

static int sgi_clock_set(const clockid_t clockid, const struct timespec *tp)

{



	u64 nsec;

include/linux/posix-timers.h

+3 −2
Original line number Diff line number Diff line
@@ -69,7 +69,8 @@ struct k_itimer { 
struct k_clock {

	int res;		/* in nanoseconds */

	int (*clock_getres) (const clockid_t which_clock, struct timespec *tp);

	int (*clock_set) (const clockid_t which_clock, struct timespec * tp);

	int (*clock_set) (const clockid_t which_clock,

			  const struct timespec *tp);

	int (*clock_get) (const clockid_t which_clock, struct timespec * tp);

	int (*timer_create) (struct k_itimer *timer);

	int (*nsleep) (const clockid_t which_clock, int flags,
@@ -89,7 +90,7 @@ void register_posix_clock(const clockid_t clock_id, struct k_clock *new_clock); 
/* error handlers for timer_create, nanosleep and settime */

int do_posix_clock_nonanosleep(const clockid_t, int flags, struct timespec *,

			       struct timespec __user *);

int do_posix_clock_nosettime(const clockid_t, struct timespec *tp);

int do_posix_clock_nosettime(const clockid_t, const struct timespec *tp);



/* function to call to trigger timer event */

int posix_timer_event(struct k_itimer *timr, int si_private);

include/linux/security.h

+5 −4
Original line number Diff line number Diff line
@@ -53,7 +53,7 @@ struct audit_krule; 
 */

extern int cap_capable(struct task_struct *tsk, const struct cred *cred,

		       int cap, int audit);

extern int cap_settime(struct timespec *ts, struct timezone *tz);

extern int cap_settime(const struct timespec *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);
@@ -1387,7 +1387,7 @@ struct security_operations { 
	int (*quotactl) (int cmds, int type, int id, struct super_block *sb);

	int (*quota_on) (struct dentry *dentry);

	int (*syslog) (int type);

	int (*settime) (struct timespec *ts, struct timezone *tz);

	int (*settime) (const struct timespec *ts, const struct timezone *tz);

	int (*vm_enough_memory) (struct mm_struct *mm, long pages);



	int (*bprm_set_creds) (struct linux_binprm *bprm);
@@ -1669,7 +1669,7 @@ int security_sysctl(struct ctl_table *table, int op); 
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(struct timespec *ts, struct timezone *tz);

int security_settime(const struct timespec *ts, const struct timezone *tz);

int security_vm_enough_memory(long pages);

int security_vm_enough_memory_mm(struct mm_struct *mm, long pages);

int security_vm_enough_memory_kern(long pages);
@@ -1904,7 +1904,8 @@ static inline int security_syslog(int type) 
	return 0;

}



static inline int security_settime(struct timespec *ts, struct timezone *tz)

static inline int security_settime(const struct timespec *ts,

				   const struct timezone *tz)

{

	return cap_settime(ts, tz);

}

include/linux/time.h

+3 −2
Original line number Diff line number Diff line
@@ -145,8 +145,9 @@ static inline u32 arch_gettimeoffset(void) { return 0; } 
#endif



extern void do_gettimeofday(struct timeval *tv);

extern int do_settimeofday(struct timespec *tv);

extern int do_sys_settimeofday(struct timespec *tv, struct timezone *tz);

extern int do_settimeofday(const struct timespec *tv);

extern int do_sys_settimeofday(const struct timespec *tv,

			       const struct timezone *tz);

#define do_posix_clock_monotonic_gettime(ts) ktime_get_ts(ts)

extern long do_utimes(int dfd, const char __user *filename, struct timespec *times, int flags);

struct itimerval;

kernel/posix-timers.c

+2 −2
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ static int common_clock_get(clockid_t which_clock, struct timespec *tp) 
}



static inline int common_clock_set(const clockid_t which_clock,

				   struct timespec *tp)

				   const struct timespec *tp)

{

	return do_sys_settimeofday(tp, NULL);

}
@@ -928,7 +928,7 @@ void exit_itimers(struct signal_struct *sig) 
}



/* Not available / possible... functions */

int do_posix_clock_nosettime(const clockid_t clockid, struct timespec *tp)

int do_posix_clock_nosettime(const clockid_t clockid, const struct timespec *tp)

{

	return -EINVAL;

}