Module Name: src
Committed By: joerg
Date: Mon Nov 23 23:45:44 UTC 2015
Modified Files:
src/sys/kern: kern_ntptime.c
Log Message:
Cast argument to uint64_t first before shifting to avoid UB for
left-shifting negative values.
To generate a diff of this commit:
cvs rdiff -u -r1.56 -r1.57 src/sys/kern/kern_ntptime.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/kern/kern_ntptime.c
diff -u src/sys/kern/kern_ntptime.c:1.56 src/sys/kern/kern_ntptime.c:1.57
--- src/sys/kern/kern_ntptime.c:1.56 Fri Jul 24 13:02:52 2015
+++ src/sys/kern/kern_ntptime.c Mon Nov 23 23:45:44 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: kern_ntptime.c,v 1.56 2015/07/24 13:02:52 maxv Exp $ */
+/* $NetBSD: kern_ntptime.c,v 1.57 2015/11/23 23:45:44 joerg Exp $ */
/*-
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -60,7 +60,7 @@
#include <sys/cdefs.h>
/* __FBSDID("$FreeBSD: src/sys/kern/kern_ntptime.c,v 1.59 2005/05/28 14:34:41 rwatson Exp $"); */
-__KERNEL_RCSID(0, "$NetBSD: kern_ntptime.c,v 1.56 2015/07/24 13:02:52 maxv Exp $");
+__KERNEL_RCSID(0, "$NetBSD: kern_ntptime.c,v 1.57 2015/11/23 23:45:44 joerg Exp $");
#ifdef _KERNEL_OPT
#include "opt_ntp.h"
@@ -99,7 +99,7 @@ typedef int64_t l_fp;
#define L_MPY(v, a) ((v) *= (a))
#define L_CLR(v) ((v) = 0)
#define L_ISNEG(v) ((v) < 0)
-#define L_LINT(v, a) ((v) = (int64_t)(a) << 32)
+#define L_LINT(v, a) ((v) = (int64_t)((uint64_t)(a) << 32))
#define L_GINT(v) ((v) < 0 ? -(-(v) >> 32) : (v) >> 32)
#ifdef NTP
