From patchwork Thu Oct 10 18:35:40 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bethany Jamison X-Patchwork-Id: 1995680 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=lists.ubuntu.com (client-ip=185.125.189.65; helo=lists.ubuntu.com; envelope-from=kernel-team-bounces@lists.ubuntu.com; receiver=patchwork.ozlabs.org) Received: from lists.ubuntu.com (lists.ubuntu.com [185.125.189.65]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4XPdk342X2z1xtv for ; Fri, 11 Oct 2024 05:35:55 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=lists.ubuntu.com) by lists.ubuntu.com with esmtp (Exim 4.86_2) (envelope-from ) id 1syy0q-0008Dg-Nq; Thu, 10 Oct 2024 18:35:48 +0000 Received: from smtp-relay-internal-1.internal ([10.131.114.114] helo=smtp-relay-internal-1.canonical.com) by lists.ubuntu.com with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.86_2) (envelope-from ) id 1syy0n-0008D9-O1 for kernel-team@lists.ubuntu.com; Thu, 10 Oct 2024 18:35:45 +0000 Received: from mail-io1-f70.google.com (mail-io1-f70.google.com [209.85.166.70]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by smtp-relay-internal-1.canonical.com (Postfix) with ESMTPS id 7CF0D3F2E4 for ; Thu, 10 Oct 2024 18:35:45 +0000 (UTC) Received: by mail-io1-f70.google.com with SMTP id ca18e2360f4ac-8354cbec0d5so6278239f.1 for ; Thu, 10 Oct 2024 11:35:45 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1728585344; x=1729190144; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=hqhsGk6BAuAuR3ey5FWMSsA95h7Gfl1qrPdPpzt1JOk=; b=jLE4P44R6ygsyRraJupZXmvWONDa0Q5i5ZjZbPxK6a8k9Wrpae8YwMjVh87zYN5Xdd +rcGdBN8YO0oxY6KmD5x3a7nWWFnoqrQYjRAjMHdFRz/UgNAP4KePEwP3KC0gygs08xX Tk3jakzLO3T3AweMJUUR8DGPNYUkQUh4DN2lNqBI1axOAgTL25+kEbvuo2bSvDAbAMXg gpvz+8LEfX0DuvC01xMVAnrA5z0LzqfjVt7u8aYHRf8AVAfgi+7mitHtRFuQexYTiJDE MzJKiR4DcX7YGyTlkXhGNxrBJxpgGtlQS0EU2BHeEPZDWrMGen4ENAOkcjgkk3VCxYeG GjDQ== X-Gm-Message-State: AOJu0YzHDKzW705iFRjauZwilDsV7kOdciWi5lYwdE045kPrUaucz/Or S0xoVptO8tKflU9Tsil8CM86vu93AU03CitWcj/Nvv0sIPJjRRUu+YscrKWF+F9CYLZ1qXod7YD leC51jjcLAoCIzJpEVVtkBkbOsy+G+5I3ukTY1c/yx3sH+rVcA9mAQNCDX+t1aPNnnlozn6C8Uj oc6UhiXdUj6A== X-Received: by 2002:a05:6e02:1c46:b0:3a0:a1ab:7ce6 with SMTP id e9e14a558f8ab-3a397cdda26mr19243705ab.1.1728585344127; Thu, 10 Oct 2024 11:35:44 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEIaghYtWdsMIG9J35NzJ2Wv4aZVfDwrP1zle9Zx/DgyYl4Ewj60EzqaJfBvAfjdkPN4Zhh+g== X-Received: by 2002:a05:6e02:1c46:b0:3a0:a1ab:7ce6 with SMTP id e9e14a558f8ab-3a397cdda26mr19243665ab.1.1728585343663; Thu, 10 Oct 2024 11:35:43 -0700 (PDT) Received: from smtp.gmail.com (167-248-51-36.oa02.lnk04.ne.dynamic.allophone.net. [167.248.51.36]) by smtp.gmail.com with ESMTPSA id e9e14a558f8ab-3a3afde46a0sm3738095ab.60.2024.10.10.11.35.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 10 Oct 2024 11:35:42 -0700 (PDT) From: Bethany Jamison To: kernel-team@lists.ubuntu.com Subject: [SRU][N][PATCH 1/1] hwmon: (lm95234) Fix underflows seen when writing limit attributes Date: Thu, 10 Oct 2024 13:35:40 -0500 Message-Id: <20241010183540.29209-2-bethany.jamison@canonical.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20241010183540.29209-1-bethany.jamison@canonical.com> References: <20241010183540.29209-1-bethany.jamison@canonical.com> MIME-Version: 1.0 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: kernel-team-bounces@lists.ubuntu.com Sender: "kernel-team" From: Guenter Roeck [ Upstream commit af64e3e1537896337405f880c1e9ac1f8c0c6198 ] DIV_ROUND_CLOSEST() after kstrtol() results in an underflow if a large negative number such as -9223372036854775808 is provided by the user. Fix it by reordering clamp_val() and DIV_ROUND_CLOSEST() operations. Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin (cherry picked from commit 16f42953231be1e7be77bc24005270d9e0d9d2ee linux-6.10.y) CVE-2024-46758 Signed-off-by: Bethany Jamison --- drivers/hwmon/lm95234.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/drivers/hwmon/lm95234.c b/drivers/hwmon/lm95234.c index 67b9d7636ee42..37e8e9679aeb6 100644 --- a/drivers/hwmon/lm95234.c +++ b/drivers/hwmon/lm95234.c @@ -301,7 +301,8 @@ static ssize_t tcrit2_store(struct device *dev, struct device_attribute *attr, if (ret < 0) return ret; - val = clamp_val(DIV_ROUND_CLOSEST(val, 1000), 0, index ? 255 : 127); + val = DIV_ROUND_CLOSEST(clamp_val(val, 0, (index ? 255 : 127) * 1000), + 1000); mutex_lock(&data->update_lock); data->tcrit2[index] = val; @@ -350,7 +351,7 @@ static ssize_t tcrit1_store(struct device *dev, struct device_attribute *attr, if (ret < 0) return ret; - val = clamp_val(DIV_ROUND_CLOSEST(val, 1000), 0, 255); + val = DIV_ROUND_CLOSEST(clamp_val(val, 0, 255000), 1000); mutex_lock(&data->update_lock); data->tcrit1[index] = val; @@ -391,7 +392,7 @@ static ssize_t tcrit1_hyst_store(struct device *dev, if (ret < 0) return ret; - val = DIV_ROUND_CLOSEST(val, 1000); + val = DIV_ROUND_CLOSEST(clamp_val(val, -255000, 255000), 1000); val = clamp_val((int)data->tcrit1[index] - val, 0, 31); mutex_lock(&data->update_lock); @@ -431,7 +432,7 @@ static ssize_t offset_store(struct device *dev, struct device_attribute *attr, return ret; /* Accuracy is 1/2 degrees C */ - val = clamp_val(DIV_ROUND_CLOSEST(val, 500), -128, 127); + val = DIV_ROUND_CLOSEST(clamp_val(val, -64000, 63500), 500); mutex_lock(&data->update_lock); data->toffset[index] = val;