leandrof/linux
1
0
Fork 0
forked from Minki/linux
Code Issues Pull Requests Packages Projects Releases Wiki Activity

timex: use __kernel_timex internally

Browse Source 
struct timex is not y2038 safe.
Replace all uses of timex with y2038 safe __kernel_timex.

Note that struct __kernel_timex is an ABI interface definition.
We could define a new structure based on __kernel_timex that
is only available internally instead. Right now, there isn't
a strong motivation for this as the structure is isolated to
a few defined struct timex interfaces and such a structure would
be exactly the same as struct timex.

The patch was generated by the following coccinelle script:

virtual patch

@depends on patch forall@
identifier ts;
expression e;
@@
(
- struct timex ts;
+ struct __kernel_timex ts;
|
- struct timex ts = {};
+ struct __kernel_timex ts = {};
|
- struct timex ts = e;
+ struct __kernel_timex ts = e;
|
- struct timex *ts;
+ struct __kernel_timex *ts;
|
(memset \| copy_from_user \| copy_to_user \)(...,
- sizeof(struct timex))
+ sizeof(struct __kernel_timex))
)

@depends on patch forall@
identifier ts;
identifier fn;
@@
fn(...,
- struct timex *ts,
+ struct __kernel_timex *ts,
...) {
...
}

@depends on patch forall@
identifier ts;
identifier fn;
@@
fn(...,
- struct timex *ts) {
+ struct __kernel_timex *ts) {
...
}

Signed-off-by: Deepa Dinamani <deepa.kernel@gmail.com>
Cc: linux-alpha@vger.kernel.org
Cc: netdev@vger.kernel.org
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
This commit is contained in:
Deepa Dinamani 2018-07-02 22:44:21 -07:00 committed by Arnd Bergmann
parent 1a596398a3
commit ead25417f8
13 changed files with 38 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
arch/alpha/kernel/osf_sys.c
View File

@ -1253,7 +1253,7 @@ struct timex32 {
SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p) SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
{ {
struct timex txc; struct __kernel_timex txc;
int ret; int ret;
/* copy relevant bits of struct timex. */ /* copy relevant bits of struct timex. */
@ -1270,7 +1270,8 @@ SYSCALL_DEFINE1(old_adjtimex, struct timex32 __user *, txc_p)
if (copy_to_user(txc_p, &txc, offsetof(struct timex32, time)) || if (copy_to_user(txc_p, &txc, offsetof(struct timex32, time)) ||
(copy_to_user(&txc_p->tick, &txc.tick, sizeof(struct timex32) - (copy_to_user(&txc_p->tick, &txc.tick, sizeof(struct timex32) -
offsetof(struct timex32, tick))) || offsetof(struct timex32, tick))) ||
(put_tv_to_tv32(&txc_p->time, &txc.time))) (put_user(txc.time.tv_sec, &txc_p->time.tv_sec)) ||
(put_user(txc.time.tv_usec, &txc_p->time.tv_usec)))
return -EFAULT; return -EFAULT;
return ret; return ret;

4
arch/sparc/kernel/sys_sparc_64.c
View File

@ -548,7 +548,7 @@ out_unlock:
SYSCALL_DEFINE1(sparc_adjtimex, struct timex __user *, txc_p) SYSCALL_DEFINE1(sparc_adjtimex, struct timex __user *, txc_p)
{ {
struct timex txc; /* Local copy of parameter */ struct timex txc; /* Local copy of parameter */
struct timex *kt = (void *)&txc; struct __kernel_timex *kt = (void *)&txc;
int ret; int ret;
/* Copy the user data space into the kernel copy /* Copy the user data space into the kernel copy
@ -572,7 +572,7 @@ SYSCALL_DEFINE1(sparc_adjtimex, struct timex __user *, txc_p)
SYSCALL_DEFINE2(sparc_clock_adjtime, const clockid_t, which_clock,struct timex __user *, txc_p) SYSCALL_DEFINE2(sparc_clock_adjtime, const clockid_t, which_clock,struct timex __user *, txc_p)
{ {
struct timex txc; /* Local copy of parameter */ struct timex txc; /* Local copy of parameter */
struct timex *kt = (void *)&txc; struct __kernel_timex *kt = (void *)&txc;
int ret; int ret;
if (!IS_ENABLED(CONFIG_POSIX_TIMERS)) { if (!IS_ENABLED(CONFIG_POSIX_TIMERS)) {

2
drivers/ptp/ptp_clock.c
View File

@ -124,7 +124,7 @@ static int ptp_clock_gettime(struct posix_clock *pc, struct timespec64 *tp)
return err; return err;
} }
static int ptp_clock_adjtime(struct posix_clock *pc, struct timex *tx) static int ptp_clock_adjtime(struct posix_clock *pc, struct __kernel_timex *tx)
{ {
struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock); struct ptp_clock *ptp = container_of(pc, struct ptp_clock, clock);
struct ptp_clock_info *ops; struct ptp_clock_info *ops;

2
include/linux/posix-clock.h
View File

@ -51,7 +51,7 @@ struct posix_clock;
struct posix_clock_operations { struct posix_clock_operations {
struct module *owner; struct module *owner;
int (*clock_adjtime)(struct posix_clock *pc, struct timex *tx); int (*clock_adjtime)(struct posix_clock *pc, struct __kernel_timex *tx);
int (*clock_gettime)(struct posix_clock *pc, struct timespec64 *ts); int (*clock_gettime)(struct posix_clock *pc, struct timespec64 *ts);

6
include/linux/time32.h
View File

@ -69,9 +69,9 @@ extern int get_old_itimerspec32(struct itimerspec64 *its,
const struct old_itimerspec32 __user *uits); const struct old_itimerspec32 __user *uits);
extern int put_old_itimerspec32(const struct itimerspec64 *its, extern int put_old_itimerspec32(const struct itimerspec64 *its,
struct old_itimerspec32 __user *uits); struct old_itimerspec32 __user *uits);
struct timex; struct __kernel_timex;
int get_old_timex32(struct timex *, const struct old_timex32 __user *); int get_old_timex32(struct __kernel_timex *, const struct old_timex32 __user *);
int put_old_timex32(struct old_timex32 __user *, const struct timex *); int put_old_timex32(struct old_timex32 __user *, const struct __kernel_timex *);
#if __BITS_PER_LONG == 64 #if __BITS_PER_LONG == 64

4
include/linux/timex.h
View File

@ -158,8 +158,8 @@ extern unsigned long tick_nsec; /* SHIFTED_HZ period (nsec) */
#define NTP_INTERVAL_FREQ (HZ) #define NTP_INTERVAL_FREQ (HZ)
#define NTP_INTERVAL_LENGTH (NSEC_PER_SEC/NTP_INTERVAL_FREQ) #define NTP_INTERVAL_LENGTH (NSEC_PER_SEC/NTP_INTERVAL_FREQ)
extern int do_adjtimex(struct timex *); extern int do_adjtimex(struct __kernel_timex *);
extern int do_clock_adjtime(const clockid_t which_clock, struct timex * ktx); extern int do_clock_adjtime(const clockid_t which_clock, struct __kernel_timex * ktx);
extern void hardpps(const struct timespec64 *, const struct timespec64 *); extern void hardpps(const struct timespec64 *, const struct timespec64 *);

18
kernel/time/ntp.c
View File

@ -188,13 +188,13 @@ static inline int is_error_status(int status)
&& (status & (STA_PPSWANDER|STA_PPSERROR))); && (status & (STA_PPSWANDER|STA_PPSERROR)));
} }
static inline void pps_fill_timex(struct timex *txc) static inline void pps_fill_timex(struct __kernel_timex *txc)
{ {
txc->ppsfreq = shift_right((pps_freq >> PPM_SCALE_INV_SHIFT) * txc->ppsfreq = shift_right((pps_freq >> PPM_SCALE_INV_SHIFT) *
PPM_SCALE_INV, NTP_SCALE_SHIFT); PPM_SCALE_INV, NTP_SCALE_SHIFT);
txc->jitter = pps_jitter; txc->jitter = pps_jitter;
if (!(time_status & STA_NANO)) if (!(time_status & STA_NANO))
txc->jitter /= NSEC_PER_USEC; txc->jitter = pps_jitter / NSEC_PER_USEC;
txc->shift = pps_shift; txc->shift = pps_shift;
txc->stabil = pps_stabil; txc->stabil = pps_stabil;
txc->jitcnt = pps_jitcnt; txc->jitcnt = pps_jitcnt;
@ -220,7 +220,7 @@ static inline int is_error_status(int status)
return status & (STA_UNSYNC|STA_CLOCKERR); return status & (STA_UNSYNC|STA_CLOCKERR);
} }
static inline void pps_fill_timex(struct timex *txc) static inline void pps_fill_timex(struct __kernel_timex *txc)
{ {
/* PPS is not implemented, so these are zero */ /* PPS is not implemented, so these are zero */
txc->ppsfreq = 0; txc->ppsfreq = 0;
@ -633,7 +633,7 @@ void ntp_notify_cmos_timer(void)
/* /*
* Propagate a new txc->status value into the NTP state: * Propagate a new txc->status value into the NTP state:
*/ */
static inline void process_adj_status(const struct timex *txc) static inline void process_adj_status(const struct __kernel_timex *txc)
{ {
if ((time_status & STA_PLL) && !(txc->status & STA_PLL)) { if ((time_status & STA_PLL) && !(txc->status & STA_PLL)) {
time_state = TIME_OK; time_state = TIME_OK;
@ -656,7 +656,8 @@ static inline void process_adj_status(const struct timex *txc)
} }
static inline void process_adjtimex_modes(const struct timex *txc, s32 *time_tai) static inline void process_adjtimex_modes(const struct __kernel_timex *txc,
s32 *time_tai)
{ {
if (txc->modes & ADJ_STATUS) if (txc->modes & ADJ_STATUS)
process_adj_status(txc); process_adj_status(txc);
@ -707,7 +708,8 @@ static inline void process_adjtimex_modes(const struct timex *txc, s32 *time_tai
* adjtimex mainly allows reading (and writing, if superuser) of * adjtimex mainly allows reading (and writing, if superuser) of
* kernel time-keeping variables. used by xntpd. * kernel time-keeping variables. used by xntpd.
*/ */
int __do_adjtimex(struct timex *txc, const struct timespec64 *ts, s32 *time_tai) int __do_adjtimex(struct __kernel_timex *txc, const struct timespec64 *ts,
s32 *time_tai)
{ {
int result; int result;
@ -729,7 +731,7 @@ int __do_adjtimex(struct timex *txc, const struct timespec64 *ts, s32 *time_tai)
txc->offset = shift_right(time_offset * NTP_INTERVAL_FREQ, txc->offset = shift_right(time_offset * NTP_INTERVAL_FREQ,
NTP_SCALE_SHIFT); NTP_SCALE_SHIFT);
if (!(time_status & STA_NANO)) if (!(time_status & STA_NANO))
txc->offset /= NSEC_PER_USEC; txc->offset = (u32)txc->offset / NSEC_PER_USEC;
} }
result = time_state; /* mostly `TIME_OK' */ result = time_state; /* mostly `TIME_OK' */
@ -754,7 +756,7 @@ int __do_adjtimex(struct timex *txc, const struct timespec64 *ts, s32 *time_tai)
txc->time.tv_sec = (time_t)ts->tv_sec; txc->time.tv_sec = (time_t)ts->tv_sec;
txc->time.tv_usec = ts->tv_nsec; txc->time.tv_usec = ts->tv_nsec;
if (!(time_status & STA_NANO)) if (!(time_status & STA_NANO))
txc->time.tv_usec /= NSEC_PER_USEC; txc->time.tv_usec = ts->tv_nsec / NSEC_PER_USEC;
/* Handle leapsec adjustments */ /* Handle leapsec adjustments */
if (unlikely(ts->tv_sec >= ntp_next_leap_sec)) { if (unlikely(ts->tv_sec >= ntp_next_leap_sec)) {

2
kernel/time/ntp_internal.h
View File

@ -8,6 +8,6 @@ extern void ntp_clear(void);
extern u64 ntp_tick_length(void); extern u64 ntp_tick_length(void);
extern ktime_t ntp_get_next_leap(void); extern ktime_t ntp_get_next_leap(void);
extern int second_overflow(time64_t secs); extern int second_overflow(time64_t secs);
extern int __do_adjtimex(struct timex *txc, const struct timespec64 *ts, s32 *time_tai); extern int __do_adjtimex(struct __kernel_timex *txc, const struct timespec64 *ts, s32 *time_tai);
extern void __hardpps(const struct timespec64 *phase_ts, const struct timespec64 *raw_ts); extern void __hardpps(const struct timespec64 *phase_ts, const struct timespec64 *raw_ts);
#endif /* _LINUX_NTP_INTERNAL_H */ #endif /* _LINUX_NTP_INTERNAL_H */

2
kernel/time/posix-clock.c
View File

@ -228,7 +228,7 @@ static void put_clock_desc(struct posix_clock_desc *cd)
fput(cd->fp); fput(cd->fp);
} }
static int pc_clock_adjtime(clockid_t id, struct timex *tx) static int pc_clock_adjtime(clockid_t id, struct __kernel_timex *tx)
{ {
struct posix_clock_desc cd; struct posix_clock_desc cd;
int err; int err;

8
kernel/time/posix-timers.c
View File

@ -179,7 +179,7 @@ static int posix_clock_realtime_set(const clockid_t which_clock,
} }
static int posix_clock_realtime_adj(const clockid_t which_clock, static int posix_clock_realtime_adj(const clockid_t which_clock,
struct timex *t) struct __kernel_timex *t)
{ {
return do_adjtimex(t); return do_adjtimex(t);
} }
@ -1047,7 +1047,7 @@ SYSCALL_DEFINE2(clock_gettime, const clockid_t, which_clock,
return error; return error;
} }
int do_clock_adjtime(const clockid_t which_clock, struct timex * ktx) int do_clock_adjtime(const clockid_t which_clock, struct __kernel_timex * ktx)
{ {
const struct k_clock *kc = clockid_to_kclock(which_clock); const struct k_clock *kc = clockid_to_kclock(which_clock);
@ -1062,7 +1062,7 @@ int do_clock_adjtime(const clockid_t which_clock, struct timex * ktx)
SYSCALL_DEFINE2(clock_adjtime, const clockid_t, which_clock, SYSCALL_DEFINE2(clock_adjtime, const clockid_t, which_clock,
struct timex __user *, utx) struct timex __user *, utx)
{ {
struct timex ktx; struct __kernel_timex ktx;
int err; int err;
if (copy_from_user(&ktx, utx, sizeof(ktx))) if (copy_from_user(&ktx, utx, sizeof(ktx)))
@ -1132,7 +1132,7 @@ COMPAT_SYSCALL_DEFINE2(clock_gettime, clockid_t, which_clock,
COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock, COMPAT_SYSCALL_DEFINE2(clock_adjtime, clockid_t, which_clock,
struct old_timex32 __user *, utp) struct old_timex32 __user *, utp)
{ {
struct timex ktx; struct __kernel_timex ktx;
int err; int err;
err = get_old_timex32(&ktx, utp); err = get_old_timex32(&ktx, utp);

2
kernel/time/posix-timers.h
View File

@ -8,7 +8,7 @@ struct k_clock {
const struct timespec64 *tp); const struct timespec64 *tp);
int (*clock_get)(const clockid_t which_clock, int (*clock_get)(const clockid_t which_clock,
struct timespec64 *tp); struct timespec64 *tp);
int (*clock_adj)(const clockid_t which_clock, struct timex *tx); int (*clock_adj)(const clockid_t which_clock, struct __kernel_timex *tx);
int (*timer_create)(struct k_itimer *timer); int (*timer_create)(struct k_itimer *timer);
int (*nsleep)(const clockid_t which_clock, int flags, int (*nsleep)(const clockid_t which_clock, int flags,
const struct timespec64 *); const struct timespec64 *);

14
kernel/time/time.c
View File

@ -265,25 +265,25 @@ COMPAT_SYSCALL_DEFINE2(settimeofday, struct old_timeval32 __user *, tv,
SYSCALL_DEFINE1(adjtimex, struct timex __user *, txc_p) SYSCALL_DEFINE1(adjtimex, struct timex __user *, txc_p)
{ {
struct timex txc; /* Local copy of parameter */ struct __kernel_timex txc; /* Local copy of parameter */
int ret; int ret;
/* Copy the user data space into the kernel copy /* Copy the user data space into the kernel copy
* structure. But bear in mind that the structures * structure. But bear in mind that the structures
* may change * may change
*/ */
if (copy_from_user(&txc, txc_p, sizeof(struct timex))) if (copy_from_user(&txc, txc_p, sizeof(struct __kernel_timex)))
return -EFAULT; return -EFAULT;
ret = do_adjtimex(&txc); ret = do_adjtimex(&txc);
return copy_to_user(txc_p, &txc, sizeof(struct timex)) ? -EFAULT : ret; return copy_to_user(txc_p, &txc, sizeof(struct __kernel_timex)) ? -EFAULT : ret;
} }
#ifdef CONFIG_COMPAT_32BIT_TIME #ifdef CONFIG_COMPAT_32BIT_TIME
int get_old_timex32(struct timex *txc, const struct old_timex32 __user *utp) int get_old_timex32(struct __kernel_timex *txc, const struct old_timex32 __user *utp)
{ {
struct old_timex32 tx32; struct old_timex32 tx32;
memset(txc, 0, sizeof(struct timex)); memset(txc, 0, sizeof(struct __kernel_timex));
if (copy_from_user(&tx32, utp, sizeof(struct old_timex32))) if (copy_from_user(&tx32, utp, sizeof(struct old_timex32)))
return -EFAULT; return -EFAULT;
@ -311,7 +311,7 @@ int get_old_timex32(struct timex *txc, const struct old_timex32 __user *utp)
return 0; return 0;
} }
int put_old_timex32(struct old_timex32 __user *utp, const struct timex *txc) int put_old_timex32(struct old_timex32 __user *utp, const struct __kernel_timex *txc)
{ {
struct old_timex32 tx32; struct old_timex32 tx32;
@ -344,7 +344,7 @@ int put_old_timex32(struct old_timex32 __user *utp, const struct timex *txc)
COMPAT_SYSCALL_DEFINE1(adjtimex, struct old_timex32 __user *, utp) COMPAT_SYSCALL_DEFINE1(adjtimex, struct old_timex32 __user *, utp)
{ {
struct timex txc; struct __kernel_timex txc;
int err, ret; int err, ret;
err = get_old_timex32(&txc, utp); err = get_old_timex32(&txc, utp);

4
kernel/time/timekeeping.c
View File

@ -2234,7 +2234,7 @@ ktime_t ktime_get_update_offsets_now(unsigned int *cwsseq, ktime_t *offs_real,
/** /**
* timekeeping_validate_timex - Ensures the timex is ok for use in do_adjtimex * timekeeping_validate_timex - Ensures the timex is ok for use in do_adjtimex
*/ */
static int timekeeping_validate_timex(const struct timex *txc) static int timekeeping_validate_timex(const struct __kernel_timex *txc)
{ {
if (txc->modes & ADJ_ADJTIME) { if (txc->modes & ADJ_ADJTIME) {
/* singleshot must not be used with any other mode bits */ /* singleshot must not be used with any other mode bits */
@ -2300,7 +2300,7 @@ static int timekeeping_validate_timex(const struct timex *txc)
/** /**
* do_adjtimex() - Accessor function to NTP __do_adjtimex function * do_adjtimex() - Accessor function to NTP __do_adjtimex function
*/ */
int do_adjtimex(struct timex *txc) int do_adjtimex(struct __kernel_timex *txc)
{ {
struct timekeeper *tk = &tk_core.timekeeper; struct timekeeper *tk = &tk_core.timekeeper;
unsigned long flags; unsigned long flags;