From patchwork Tue Sep 10 15:19:29 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nick Crews X-Patchwork-Id: 1160407 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=linux-rtc-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=pass (p=none dis=none) header.from=chromium.org Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=chromium.org header.i=@chromium.org header.b="kYw/oUI/"; dkim-atps=neutral Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 46STGv6LPhz9s4Y for ; Wed, 11 Sep 2019 01:19:51 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731099AbfIJPTv (ORCPT ); Tue, 10 Sep 2019 11:19:51 -0400 Received: from mail-wr1-f65.google.com ([209.85.221.65]:41356 "EHLO mail-wr1-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726060AbfIJPTu (ORCPT ); Tue, 10 Sep 2019 11:19:50 -0400 Received: by mail-wr1-f65.google.com with SMTP id h7so20048672wrw.8 for ; Tue, 10 Sep 2019 08:19:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=from:to:cc:subject:date:message-id; bh=vmUuCMkzir2Sv0OO2nHQXi9m+juUE2w8XHaiTSroSHA=; b=kYw/oUI/H82GJRyFfkUzR4+OURd1LYYPwpXS5Eassv7VrsNI7XMdZAjX/Hem4mUJmh Q07kd8PYu2S/HY2W5SC/lu+yJ4R0w793l/6htAF9mDMKAzMoFl2DMq1iT6b+LwK6IaQ7 UOtLAN5bR7qX4XSlusnmqgKWZ9hozJtU1Zp8s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=vmUuCMkzir2Sv0OO2nHQXi9m+juUE2w8XHaiTSroSHA=; b=SG5RnrKDXUZOiJr0du7udc0rJzMp/Ef0RmV7NKbo5jIgTUcuE6WxqaSvUP+/2TzLx9 O6mqMluvVNv0s5+O353bO/MRJ7y40uH3u5k1iCMc8CuS02anoi9wyqSRv2nXR3UUsPsp KuFB6nPHEFdFNvuEsFzG1C8hfd7ejezNbF7G9IPMdanGpkve+cXZjQzXN7r0rQfUkM/p 6vmw16szq77Fe4Gw3yA/L1lL6TJyT6xGUg8gNhh9+3sWakxc7iB/rWC+xgNPCsa5zVtF utwSr2UoLk1rlThUDhBw4qnh4rm1mgxGg2R9D6rjuGJ++RC+TQ1D9YPTKjc3eMCP4QxI Rxuw== X-Gm-Message-State: APjAAAWqfA9ZFZWFHZicU2g9wMyRaKhKWxdpDz4WuP1+hLFJqFPqlgSK yp+RQIEuBSh/R6+VgMSbvhZCPQ== X-Google-Smtp-Source: APXvYqw39BL6cpTQ2h3WRAEb89m10wkW4DGlcBRXCORRYb3DbUpcGPbZICuw3hLTec/QOR2bEOCGEQ== X-Received: by 2002:a5d:678a:: with SMTP id v10mr26708489wru.145.1568128788717; Tue, 10 Sep 2019 08:19:48 -0700 (PDT) Received: from penguin.lxd ([148.69.85.38]) by smtp.gmail.com with ESMTPSA id o22sm32753305wra.96.2019.09.10.08.19.47 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 10 Sep 2019 08:19:48 -0700 (PDT) From: Nick Crews To: Alexandre Belloni , Alessandro Zummo Cc: linux-rtc@vger.kernel.org, linux-kernel@vger.kernel.org, Duncan Laurie , Enric Balletbo i Serra , Nick Crews Subject: [PATCH] rtc: wilco-ec: Sanitize values received from RTC Date: Tue, 10 Sep 2019 16:19:29 +0100 Message-Id: <20190910151929.780-1-ncrews@chromium.org> X-Mailer: git-send-email 2.11.0 Sender: linux-rtc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-rtc@vger.kernel.org Check that the time received from the RTC HW is valid, otherwise the computation of rtc_year_days() in the next line could, and sometimes does, crash the kernel. While we're at it, fix the license to plain "GPL". Signed-off-by: Nick Crews --- drivers/rtc/rtc-wilco-ec.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/drivers/rtc/rtc-wilco-ec.c b/drivers/rtc/rtc-wilco-ec.c index 8ad4c4e6d557..0ccbf2dce832 100644 --- a/drivers/rtc/rtc-wilco-ec.c +++ b/drivers/rtc/rtc-wilco-ec.c @@ -110,8 +110,16 @@ static int wilco_ec_rtc_read(struct device *dev, struct rtc_time *tm) tm->tm_mday = rtc.day; tm->tm_mon = rtc.month - 1; tm->tm_year = rtc.year + (rtc.century * 100) - 1900; - tm->tm_yday = rtc_year_days(tm->tm_mday, tm->tm_mon, tm->tm_year); + if (rtc_valid_tm(tm)) { + dev_warn(dev, + "Time computed from EC RTC is invalid: sec=%d, min=%d, hour=%d, mday=%d, mon=%d, year=%d", + tm->tm_sec, tm->tm_min, tm->tm_hour, tm->mday, + tm->mon, tm->year); + return -EIO; + } + + tm->tm_yday = rtc_year_days(tm->tm_mday, tm->tm_mon, tm->tm_year); /* Don't compute day of week, we don't need it. */ tm->tm_wday = -1; @@ -188,5 +196,5 @@ module_platform_driver(wilco_ec_rtc_driver); MODULE_ALIAS("platform:rtc-wilco-ec"); MODULE_AUTHOR("Nick Crews "); -MODULE_LICENSE("GPL v2"); +MODULE_LICENSE("GPL"); MODULE_DESCRIPTION("Wilco EC RTC driver");