Skip to content

Commit

Permalink
Use 64-bit timekeeping
Browse files Browse the repository at this point in the history
This patch changes the use of struct timespec in
dccp_probe to use struct timespec64 instead. timespec uses a 32-bit
seconds field which will overflow in the year 2038 and beyond. timespec64
uses a 64-bit seconds field. Note that the correctness of the code isn't
changed, since the original code only uses the timestamps to compute a
small elapsed interval. This patch is part of a larger attempt to remove
instances of 32-bit timekeeping structures (timespec, timeval, time_t)
from the kernel so it is easier to identify where the real 2038 issues
are.

Signed-off-by: Tina Ruchandani <ruchandani.tina@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Tinabr7 authored and davem330 committed Nov 1, 2015
1 parent 1cf7d8d commit 1032a66
Showing 1 changed file with 6 additions and 5 deletions.
11 changes: 6 additions & 5 deletions net/dccp/probe.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
#include <linux/module.h>
#include <linux/kfifo.h>
#include <linux/vmalloc.h>
#include <linux/time64.h>
#include <linux/gfp.h>
#include <net/net_namespace.h>

Expand All @@ -47,20 +48,20 @@ static struct {
struct kfifo fifo;
spinlock_t lock;
wait_queue_head_t wait;
struct timespec tstart;
struct timespec64 tstart;
} dccpw;

static void printl(const char *fmt, ...)
{
va_list args;
int len;
struct timespec now;
struct timespec64 now;
char tbuf[256];

va_start(args, fmt);
getnstimeofday(&now);
getnstimeofday64(&now);

now = timespec_sub(now, dccpw.tstart);
now = timespec64_sub(now, dccpw.tstart);

len = sprintf(tbuf, "%lu.%06lu ",
(unsigned long) now.tv_sec,
Expand Down Expand Up @@ -110,7 +111,7 @@ static struct jprobe dccp_send_probe = {
static int dccpprobe_open(struct inode *inode, struct file *file)
{
kfifo_reset(&dccpw.fifo);
getnstimeofday(&dccpw.tstart);
getnstimeofday64(&dccpw.tstart);
return 0;
}

Expand Down

0 comments on commit 1032a66

Please sign in to comment.