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 X-Spam-Level: X-Spam-Status: No, score=-13.1 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DD7A2C433DF for ; Sat, 8 Aug 2020 23:46:21 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id B61F520672 for ; Sat, 8 Aug 2020 23:46:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596930381; bh=J+aZmfAKvOLUYQRQl3GbWUWySDDk2hUEA4pacKAj9Zg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=WR0bnyF9P+/27VL48W+LA/hxdp3LvhrVKUJVKT0OkX7QYPQQqnuMkA7l/zPbC1cpf lO8DmxPDWJsNRaUKCpyfgj+l7PrTbkrH4C6eu6VU4tXooCR52eqb7KqwiFH6zYIQ6P Z4AVK8yvjBwQA6hM0BgUWoth8yxvfDXCXBMlCtgM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728975AbgHHXqU (ORCPT ); Sat, 8 Aug 2020 19:46:20 -0400 Received: from mail.kernel.org ([198.145.29.99]:52186 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728225AbgHHXiW (ORCPT ); Sat, 8 Aug 2020 19:38:22 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id EFEE12075D; Sat, 8 Aug 2020 23:38:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596929901; bh=J+aZmfAKvOLUYQRQl3GbWUWySDDk2hUEA4pacKAj9Zg=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=IJ3JS6dLp5DrMjIvzzP3B4MAOCP1o+XmzJiakNhHBKK95qHmXpxWvtwXLakKR7LPV 2CiSQGidi/B2qwLWcMaAP+T4AlmxK8j35Cix9X5qk7EWuYW+3cFmkcZ6fW57o6CvyD cd+6Lt0W/uJ00Ly1As99PbbTQumAqpMvVhoJJbrs= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Dmitry Vyukov , Hristo Venev , io-uring@vger.kernel.org, Jens Axboe , Sasha Levin , linux-fsdevel@vger.kernel.org Subject: [PATCH AUTOSEL 5.7 41/58] io_uring: fix sq array offset calculation Date: Sat, 8 Aug 2020 19:37:07 -0400 Message-Id: <20200808233724.3618168-41-sashal@kernel.org> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20200808233724.3618168-1-sashal@kernel.org> References: <20200808233724.3618168-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Dmitry Vyukov [ Upstream commit b36200f543ff07a1cb346aa582349141df2c8068 ] rings_size() sets sq_offset to the total size of the rings (the returned value which is used for memory allocation). This is wrong: sq array should be located within the rings, not after them. Set sq_offset to where it should be. Fixes: 75b28affdd6a ("io_uring: allocate the two rings together") Signed-off-by: Dmitry Vyukov Acked-by: Hristo Venev Cc: io-uring@vger.kernel.org Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- fs/io_uring.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/io_uring.c b/fs/io_uring.c index 4e09af1d5d223..4bfc595153c72 100644 --- a/fs/io_uring.c +++ b/fs/io_uring.c @@ -7133,6 +7133,9 @@ static unsigned long rings_size(unsigned sq_entries, unsigned cq_entries, return SIZE_MAX; #endif + if (sq_offset) + *sq_offset = off; + sq_array_size = array_size(sizeof(u32), sq_entries); if (sq_array_size == SIZE_MAX) return SIZE_MAX; @@ -7140,9 +7143,6 @@ static unsigned long rings_size(unsigned sq_entries, unsigned cq_entries, if (check_add_overflow(off, sq_array_size, &off)) return SIZE_MAX; - if (sq_offset) - *sq_offset = off; - return off; } -- 2.25.1