Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6;
From:   Wei Gao <wegao@suse.com>
To:     axboe@kernel.dk, dlemoal@kernel.org, hare@suse.de, hch@lst.de,
        niklas.cassel@wdc.com, martin.petersen@oracle.com,
        linux-block@vger.kernel.org, linux-kernel@vger.kernel.org
Cc:     Wei Gao <wegao@suse.com>
Subject: [PATCH v1] block: ioprio: Fix ioprio_check_cap() validation logic
Date:   Thu, 23 Nov 2023 22:05:25 -0500
Message-Id: <20231124030525.31426-1-wegao@suse.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?gWZyhRUAF/R3SmyP3v6SaeuC1cvBuEYNNvAY2q4wXsALyLWkNP5lxXR0OHRZ?=
 =?us-ascii?Q?QVbNSUQd3gM91KKlbybSQdHmtHmByyD4qmLWSA+kELeeKc2snuBpRe8Jgl8l?=
 =?us-ascii?Q?4u4INRmRi0IZ+7ZQhGoNRNHSCKR2vkoTeDsmGJEAv+ghw2Qrk5g55rv1BR7z?=
 =?us-ascii?Q?ByVE7SSsW6VorYw4TNzgDIQSsjNRHeoOzmFZUoDwX4guXHCBnNupJezG/Ky2?=
 =?us-ascii?Q?gRhcW9rnLpVRyGn1vWFDyrVM0b8YlGIwglpbsqS+rBVmONRkOS5l3jX29cT0?=
 =?us-ascii?Q?JiBL5t9py2m30Ms8w6Bg06A8ZQFVc2TRbma1hwuKHwxhKLK+66b/P7Ox6Hp0?=
 =?us-ascii?Q?BSaqPYErZ5ibYHlk5DiRnmXTC66fv452RyGEObKl+G3KoiSHpa/oI2tOr++4?=
 =?us-ascii?Q?E3XV/LXgBG3PY9y5MlXx5/NleOUBGHCf4Fptu0cPER48ZMn2unubwf5E6vo2?=
 =?us-ascii?Q?L29J4CXuhkV4cHfgFUPGJx0RgXHJiB3CH9E2PQPUMEVb2JCRX6ZSTa1MLgtB?=
 =?us-ascii?Q?cNTwYH++q725FCE9AYAWef0c0B6UmERAMny3aTaWbly6QPDpCSGr1yX46H1R?=
 =?us-ascii?Q?CqKrM9jDFCc3JuzjCL7o+T/N9Y5RjkxePbLZQsy6umy6Vt/JGBAS26hEXwXb?=
 =?us-ascii?Q?M0vMVYgtCq5senJj3XJeekhcJRNSyvrpPzWP02Gl7XHej57vqLIJKV/kfi6K?=
 =?us-ascii?Q?Z0fecYQVT6QRCnnVgBCzbRsamFfA4hdmtmh6uOdYO+e52dl7ogn5QzYD/wSN?=
 =?us-ascii?Q?lRgkLjROv/d1TmeCORG/9DbULl7pvrMvsF4eSQNHizTRqRtbQhFmmG5AYkUn?=
 =?us-ascii?Q?vcxWvqH4YTfD0/7k9g2nkV9HCg+kvA0gb9K6qun/TuB33PVrm0wQKmYdQ0kH?=
 =?us-ascii?Q?Os0Nq6EuQmDYW1B4ZSj7woXQDUVTUEUlXiOt6P+O/ED+dKihSnGR310VidgU?=
 =?us-ascii?Q?vP7YWT1GihFr7hS9wtmslzyKI93m4p3NUWE628UU0qrfqFQsKw1jW89DGVQj?=
 =?us-ascii?Q?sr5BR2/xkULTy5lranW/UVDMBzlmWE20n6+P/UmP0VXIH1yDMGGS9tpvYiIn?=
 =?us-ascii?Q?lbx4MIrrZHSeaWJImEKVAEqCrCpjrXPWOJZ6tBX2v/lBhbaGsYG857fVylAe?=
 =?us-ascii?Q?X87xYTlhubVtBymZcDuOVGjE0wifxbVUsgrhURt0hLARd4lUmFmVpUNhKwcm?=
 =?us-ascii?Q?KRKGMupZjWezdU5gtdX8NqIscBy94i5MrxAn3F4zDj5lMwFc+jq1UL3zacNB?=
 =?us-ascii?Q?2+9K1Xjxi1ZRxwvfg1XH9q6WAQFSFxAp57LmUwwboIt12kNIhGdUMYvQXeob?=
 =?us-ascii?Q?647kBYe+kw5gV0vloWa3mu8T+D9WWef2Dl2BKABdSFavw9VzgQCrbYk5xdKy?=
 =?us-ascii?Q?g89Uctvr+wzW8/1O6yhuLDbJbc9+p0fUNyAPXryYLe/TgrjCynEBzrw32dEk?=
 =?us-ascii?Q?76KmKVUcX2aMaiDNT07yHSlIWOZ8g8l1me1iYYu2RE6tTynvljk5U06kojj8?=
 =?us-ascii?Q?C5311HcUSFg7r9l0ndj6uxtEifOJRwCq+DVS1HZQtNYzeeLJoHwrqlZn2+zs?=
 =?us-ascii?Q?GSj/O5EhQ06esmrKP6k=3D?=
X-OriginatorOrg: suse.com
X-MS-Exchange-CrossTenant-Network-Message-Id: 7c01b3e4-6573-4a56-5abb-08dbec9a40ce
X-MS-Exchange-CrossTenant-AuthSource: AS8PR04MB8199.eurprd04.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Nov 2023 03:05:46.8152
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: f7a17af6-1c5c-4a36-aa8b-f5be247aa4ba
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: oBhBOnGiq+Mn3YGwrb2zgzsuobq13ZcIG3/3hC4AGvVc8nNHl8xhoIt40HmVLGpa
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR04MB9687
X-Spam-Status: No, score=-0.9 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=unavailable
	autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Thu, 23 Nov 2023 19:06:17 -0800 (PST)

The current logic "if (level >= IOPRIO_NR_LEVELS)" can not be reached since
level value get from IOPRIO_PRIO_LEVEL ONLY extract lower 3-bits of ioprio.
(IOPRIO_NR_LEVELS=8)

So this trigger LTP test case ioprio_set03 failed, the test case expect
error when set IOPRIO_CLASS_BE prio 8, in current implementation level
value will be 0 and obviously can not return error.

Fixes: eca2040972b4 ("scsi: block: ioprio: Clean up interface definition")
Signed-off-by: Wei Gao <wegao@suse.com>
---
 block/ioprio.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/block/ioprio.c b/block/ioprio.c
index b5a942519a79..f83029208f2a 100644
--- a/block/ioprio.c
+++ b/block/ioprio.c
@@ -33,7 +33,7 @@
 int ioprio_check_cap(int ioprio)
 {
 	int class = IOPRIO_PRIO_CLASS(ioprio);
-	int level = IOPRIO_PRIO_LEVEL(ioprio);
+	int data = IOPRIO_PRIO_DATA(ioprio);
 
 	switch (class) {
 		case IOPRIO_CLASS_RT:
@@ -49,13 +49,13 @@ int ioprio_check_cap(int ioprio)
 			fallthrough;
 			/* rt has prio field too */
 		case IOPRIO_CLASS_BE:
-			if (level >= IOPRIO_NR_LEVELS)
+			if (data >= IOPRIO_NR_LEVELS || data < 0)
 				return -EINVAL;
 			break;
 		case IOPRIO_CLASS_IDLE:
 			break;
 		case IOPRIO_CLASS_NONE:
-			if (level)
+			if (data)
 				return -EINVAL;
 			break;
 		case IOPRIO_CLASS_INVALID:
-- 
2.34.1