From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 629D6EEB57A for ; Sat, 9 Sep 2023 00:44:51 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1346250AbjIIAov (ORCPT ); Fri, 8 Sep 2023 20:44:51 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:46750 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344146AbjIIAoP (ORCPT ); Fri, 8 Sep 2023 20:44:15 -0400 Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1EF5630DC; Fri, 8 Sep 2023 17:41:46 -0700 (PDT) Received: by smtp.kernel.org (Postfix) with ESMTPSA id F4055C116B2; Sat, 9 Sep 2023 00:41:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1694220089; bh=T/QZ4ZHDJ8caz3IIghvxfJlXc9+stTCAB2/9p4aHkaI=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OtLV8mARADVbYYLPhXG1q8xe3OmUISh0GALHskZTgBjgm+U7V0hmEiMbzFc6WYqhk HazhF04EX79SgixtCwKWKAWNKglRsuNkzghhaud7nJJKMWmjGNwHVEX3eMh9tGoOkB hVh9VMDoSvJT1d7IfQ8sCIZK2KfdMhcTrtNUveFJxG/FOpHRLaLnohZPWhivEfHy8j 3zjELfl0WngMrhTs+8jNdRUzDZFMGjiba60UAhrqEOFC3ICMA2XYteuelmWpETJIFy r7iy5E4ZS7Rs4ax35taGlGYUS97S9lWHiWT/pR8dBl1G/w+90FAOZas/s5QFMbUp7I Ys02BOszHnLEA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andy Shevchenko , Nuno Sa , Jonathan Cameron , Sasha Levin , jic23@kernel.org, linux-iio@vger.kernel.org Subject: [PATCH AUTOSEL 4.14 06/12] iio: core: Use min() instead of min_t() to make code more robust Date: Fri, 8 Sep 2023 20:41:09 -0400 Message-Id: <20230909004115.3581195-6-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20230909004115.3581195-1-sashal@kernel.org> References: <20230909004115.3581195-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 4.14.325 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andy Shevchenko [ Upstream commit cb1d17535061ca295903f97f5cb0af9db719c02c ] min() has strict type checking and preferred over min_t() for unsigned types to avoid overflow. Here it's unclear why min_t() was chosen since both variables are of the same type. In any case update to use min(). Signed-off-by: Andy Shevchenko Reviewed-by: Nuno Sa Link: https://lore.kernel.org/r/20230721170022.3461-5-andriy.shevchenko@linux.intel.com Signed-off-by: Jonathan Cameron Signed-off-by: Sasha Levin --- drivers/iio/industrialio-core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/iio/industrialio-core.c b/drivers/iio/industrialio-core.c index 97b7266ee0ffa..12d73ebcadfa3 100644 --- a/drivers/iio/industrialio-core.c +++ b/drivers/iio/industrialio-core.c @@ -328,7 +328,7 @@ static ssize_t iio_debugfs_write_reg(struct file *file, char buf[80]; int ret; - count = min_t(size_t, count, (sizeof(buf)-1)); + count = min(count, sizeof(buf) - 1); if (copy_from_user(buf, userbuf, count)) return -EFAULT; -- 2.40.1