]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
iio: core: Use min() instead of min_t() to make code more robust
authorAndy Shevchenko <andriy.shevchenko@linux.intel.com>
Fri, 21 Jul 2023 17:00:18 +0000 (20:00 +0300)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 23 Sep 2023 08:47:05 +0000 (10:47 +0200)
[ 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 <andriy.shevchenko@linux.intel.com>
Reviewed-by: Nuno Sa <nuno.sa@analog.com>
Link: https://lore.kernel.org/r/20230721170022.3461-5-andriy.shevchenko@linux.intel.com
Signed-off-by: Jonathan Cameron <Jonathan.Cameron@huawei.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/iio/industrialio-core.c

index 97b7266ee0ffadeef900093d795865175256568b..12d73ebcadfa3d666b1ca17570b54e5eee040cfa 100644 (file)
@@ -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;