Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753919AbbLCUrM (ORCPT ); Thu, 3 Dec 2015 15:47:12 -0500 Received: from aserp1040.oracle.com ([141.146.126.69]:17084 "EHLO aserp1040.oracle.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752369AbbLCUrK (ORCPT ); Thu, 3 Dec 2015 15:47:10 -0500 From: Sasha Levin To: john.stultz@linaro.org, tglx@linutronix.de Cc: linux-kernel@vger.kernel.org, Sasha Levin Subject: [PATCH] ntp: verify offset doesn't overflow in ntp_update_offset Date: Thu, 3 Dec 2015 15:46:48 -0500 Message-Id: <1449175608-1146-1-git-send-email-sasha.levin@oracle.com> X-Mailer: git-send-email 2.5.0 X-Source-IP: aserv0022.oracle.com [141.146.126.234] Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1240 Lines: 40 We need to make sure that the offset is valid before manipulating it, otherwise it might overflow on the multiplication. Signed-off-by: Sasha Levin --- kernel/time/ntp.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kernel/time/ntp.c b/kernel/time/ntp.c index 149cc80..36616c3 100644 --- a/kernel/time/ntp.c +++ b/kernel/time/ntp.c @@ -297,6 +297,9 @@ static void ntp_update_offset(long offset) if (!(time_status & STA_PLL)) return; + /* Make sure the multiplication below won't overflow */ + offset = clamp(offset, -MAXPHASE, MAXPHASE); + if (!(time_status & STA_NANO)) offset *= NSEC_PER_USEC; @@ -304,8 +307,7 @@ static void ntp_update_offset(long offset) * Scale the phase adjustment and * clamp to the operating range. */ - offset = min(offset, MAXPHASE); - offset = max(offset, -MAXPHASE); + offset = clamp(offset, -MAXPHASE, MAXPHASE); /* * Select how the frequency is to be controlled -- 1.7.10.4 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/