Received: by 2002:a05:6358:1087:b0:cb:c9d3:cd90 with SMTP id j7csp7359646rwi; Mon, 24 Oct 2022 13:30:48 -0700 (PDT) X-Google-Smtp-Source: AMsMyM7gM7t6KoIlwokvuRtWfyorby2waJ1CeIkWPvaXdI6MMM55eXZx3hQ9mu0M4t7iQhlNIXWO X-Received: by 2002:a05:6402:5c9:b0:446:fb0:56bb with SMTP id n9-20020a05640205c900b004460fb056bbmr33087038edx.173.1666643437530; Mon, 24 Oct 2022 13:30:37 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666643437; cv=none; d=google.com; s=arc-20160816; b=tEpQYLUjX+ObFkrtaQ8aAc2OfPzS3GweuBBNSLFBWnW3ggZPeuRwMNRtCyWrtY4sVu o1RXBGuxrHwT21slx+xLRdeiH8R/He9qLAwUmgziX6fk3lL2wLAxVBV+GxuCDjbhA260 fgdOJALR7i4P1Cym0eWLLQ6J15ypvtn3uTGvpnNCY4/juvY8KbQT7cJhl/+Nok2aYsm4 qKyXqpDYQe4vNKPM9Q+o6obCWoVqa8KjLyr0qisnY811xJef+iyeHNRxKnZ5+HDY598n wYG6qc5GORH5U3x3cyO9MIHy82qwRoMcBPdjQNTsEvNr4Oz3axXiwX02eDDYUsp4azgO wNEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=OjMoVbBQV6FAtbR3xxxJqU4gce4jKcnxv6lOmifxSmY=; b=Mpc/R2FqOj9rYD0ZwgxMRjzw0xPPNpU6BLpuJKqbIEqHBRv3T6hkUs2djkqrmHR6kk cfp3CsMcko9X2sBpa/NycYvpsWnogc+whZOet18fvFTwWAkT0rpejx1hGK5iutW8kIGE uKv+ToODgdRQGhthPQuXlXaCxXccS6kzd+vFrmQgY1teIE0wLCemMbAeEKPXC3iOORIl fUk4NIf6DOBsVIwydBqOS+8HLVmIV9gMMlN4uc+p31YlzJqYtixAbVOB40ML0kXeGlAS wSTStJRRbpDtMQmPtCcWu2PStSKt3jB8k/N765osPWcoF3z+2iXkdx61Ey3kZgGhRlGl jkjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=r8OuWPHP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id r28-20020a50c01c000000b0045fca739593si751128edb.188.2022.10.24.13.30.11; Mon, 24 Oct 2022 13:30:37 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=r8OuWPHP; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S231390AbiJXTnx (ORCPT + 99 others); Mon, 24 Oct 2022 15:43:53 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:54426 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233165AbiJXTmA (ORCPT ); Mon, 24 Oct 2022 15:42:00 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 3595C94130; Mon, 24 Oct 2022 11:11:39 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 46B18B818B6; Mon, 24 Oct 2022 12:52:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9BFBBC43470; Mon, 24 Oct 2022 12:52:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615934; bh=MetfcoB+IKtmaq0W09gVfL1YcsBGTBDnY47DvdDM9mQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=r8OuWPHPDzcjL6ycrrxsoJWa9k+Wt9VbybeLLMt7PtqE0ADG4lOYGJH2BfY4MffUU PreM7ijEU0Qcf8LUK+hZFn2N8RxISpYc1ytRqSBD81NlBxJeerekzNocU75F0rtaYm IlL6e4NLvEJt+AUsgGQfEGK23I6MmieOkIzjFPm8= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, "Jason A. Donenfeld" , Guenter Roeck , Sasha Levin Subject: [PATCH 5.15 439/530] hwmon: (sht4x) do not overflow clamping operation on 32-bit platforms Date: Mon, 24 Oct 2022 13:33:03 +0200 Message-Id: <20221024113104.937917350@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Jason A. Donenfeld [ Upstream commit f9c0cf8f26de367c58e48b02b1cdb9c377626e6f ] On 32-bit platforms, long is 32 bits, so (long)UINT_MAX is less than (long)SHT4X_MIN_POLL_INTERVAL, which means the clamping operation is bogus. Fix this by clamping at INT_MAX, so that the upperbound is the same on all platforms. Signed-off-by: Jason A. Donenfeld Link: https://lore.kernel.org/r/20220924101151.4168414-1-Jason@zx2c4.com Signed-off-by: Guenter Roeck Signed-off-by: Sasha Levin --- drivers/hwmon/sht4x.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/hwmon/sht4x.c b/drivers/hwmon/sht4x.c index 09c2a0b06444..9aeb3dbf6c20 100644 --- a/drivers/hwmon/sht4x.c +++ b/drivers/hwmon/sht4x.c @@ -129,7 +129,7 @@ static int sht4x_read_values(struct sht4x_data *data) static ssize_t sht4x_interval_write(struct sht4x_data *data, long val) { - data->update_interval = clamp_val(val, SHT4X_MIN_POLL_INTERVAL, UINT_MAX); + data->update_interval = clamp_val(val, SHT4X_MIN_POLL_INTERVAL, INT_MAX); return 0; } -- 2.35.1