From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 9931A11C83; Sat, 3 Feb 2024 04:12:51 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706933571; cv=none; b=aZAh99Q895OOvUqRH77IfhvkxexJ6xRtZhdTaQpBUk42xGaYVkldA88rfSOHzUJZki3MeulPWIkUSCrtrtd1unQYXYIA+SofMyQ6OAFtIQZdR67OLpZTpk7chEVPvU2pu4Eg33Tkv6mZcO/36SisPOqVIPbuSCzVdMzeBjuOQRE= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1706933571; c=relaxed/simple; bh=n8JPe5XvDOEejNommyIhV4KS7UXQpxHJ9AfmwD9gDmY=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=fv3nigqUUSJwrIq1aK7OCNNcqOqabpHJRH+pIbxevlo1I5p0+MM6jKXecdk84IgROBjH/N9L80qZCygoVugz2ZgK+LHMgoaWSeoPsZ7LncuSyQQnfJQjFXuqmyqWTfXIsQCc+KLee0bf99S0gMycCDjVv8kz70o4Lb7EdMbajoE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=o2RyWhqr; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="o2RyWhqr" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 609FDC43394; Sat, 3 Feb 2024 04:12:51 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1706933571; bh=n8JPe5XvDOEejNommyIhV4KS7UXQpxHJ9AfmwD9gDmY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o2RyWhqrkDFobz5Imhp5ljTJFViRu3uOUzRgeKqM2aODYs3ey56uKd1U7Dzeo8qxE PBOWI9x1fiMU7n59V+Ksz8s2Jxqxd3dxcxm51zEHxx/qABSd1xz2ARfa6Cvp8COCL5 lSjMCUbzzKgrTFwI2qUil4YL/POfklOybVEQoilY= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, David Laight , Andy Shevchenko , Christoph Hellwig , "Jason A. Donenfeld" , Linus Torvalds , "Matthew Wilcox (Oracle)" , Andrew Morton Subject: [PATCH 6.6 099/322] minmax: allow comparisons of int against unsigned char/short Date: Fri, 2 Feb 2024 20:03:16 -0800 Message-ID: <20240203035402.334675691@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240203035359.041730947@linuxfoundation.org> References: <20240203035359.041730947@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: David Laight commit 4ead534fba42fc4fd41163297528d2aa731cd121 upstream. Since 'unsigned char/short' get promoted to 'signed int' it is safe to compare them against an 'int' value. Link: https://lkml.kernel.org/r/8732ef5f809c47c28a7be47c938b28d4@AcuMS.aculab.com Signed-off-by: David Laight Cc: Andy Shevchenko Cc: Christoph Hellwig Cc: Jason A. Donenfeld Cc: Linus Torvalds Cc: Matthew Wilcox (Oracle) Signed-off-by: Andrew Morton Signed-off-by: Greg Kroah-Hartman --- include/linux/minmax.h | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) --- a/include/linux/minmax.h +++ b/include/linux/minmax.h @@ -26,8 +26,9 @@ __builtin_choose_expr(__is_constexpr(is_signed_type(typeof(x))), \ is_signed_type(typeof(x)), 0) -#define __types_ok(x, y) \ - (__is_signed(x) == __is_signed(y)) +#define __types_ok(x, y) \ + (__is_signed(x) == __is_signed(y) || \ + __is_signed((x) + 0) == __is_signed((y) + 0)) #define __cmp_op_min < #define __cmp_op_max >