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 4A3BA155351; Tue, 23 Jul 2024 18:28:02 +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=1721759282; cv=none; b=sl5EuujILKXpiI5M+dBPZGHAa6BFtsxXWJbuHY6N3vbGDpF5cJ8HHjiEm/HkEMQOzToLJCwdgXto565V9Zr66oxPcb6h9x9vzmZt3YAVE8nVOf/vmGzBp4WRjp1yCcPrycSQWzvqXCZHpzqTNPx7m32nSzDsSZo8rjrPQxnB+E4= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1721759282; c=relaxed/simple; bh=iPtaqb5htyeFcHUwVJ4OzdpmaQVG+OjFg62DUSwmZQQ=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=Ppj5VytnkP0RAQAxz/PwVCi3IrmeHYtqbVkkw0X1uAef5s5EcUVB00ylUNW+qrypRQkc8zMZKPjwqWP7NW6ScSDGwoJXUl2EBogt/ACx+ShjunVOY3phZAbmt8L8v5XzNhR+MHuB3CJwhKEwm2BiunM9ajzB+3cEFh/xfjS7Xjw= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=wpJGU1Zj; 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="wpJGU1Zj" Received: by smtp.kernel.org (Postfix) with ESMTPSA id C71BAC4AF09; Tue, 23 Jul 2024 18:28:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1721759282; bh=iPtaqb5htyeFcHUwVJ4OzdpmaQVG+OjFg62DUSwmZQQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=wpJGU1ZjkUS0Rwp/Tp4cTanMYGhClHeG6u8LVC1cF1HoVM0XuNPLwGg4GNlOKiPuw onews225Y6LW9mdkVLRZ6G9VrVvciLoep+/jFjx9GbCdjgCw/76YCN741u1AX6O7rU jce9vhVokv2UGI8TdveeqwB6HqJjuhMvQc/ZDGYk= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Andreas Hindborg , Ming Lei , Jens Axboe , Sasha Levin Subject: [PATCH 6.1 033/105] null_blk: fix validation of block size Date: Tue, 23 Jul 2024 20:23:10 +0200 Message-ID: <20240723180404.500268519@linuxfoundation.org> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240723180402.490567226@linuxfoundation.org> References: <20240723180402.490567226@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.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Andreas Hindborg [ Upstream commit c462ecd659b5fce731f1d592285832fd6ad54053 ] Block size should be between 512 and PAGE_SIZE and be a power of 2. The current check does not validate this, so update the check. Without this patch, null_blk would Oops due to a null pointer deref when loaded with bs=1536 [1]. Link: https://lore.kernel.org/all/87wmn8mocd.fsf@metaspace.dk/ Signed-off-by: Andreas Hindborg Reviewed-by: Ming Lei Link: https://lore.kernel.org/r/20240603192645.977968-1-nmi@metaspace.dk [axboe: remove unnecessary braces and != 0 check] Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/null_blk/main.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/drivers/block/null_blk/main.c b/drivers/block/null_blk/main.c index 220cedda2ca7d..4d78b5583dc6a 100644 --- a/drivers/block/null_blk/main.c +++ b/drivers/block/null_blk/main.c @@ -1958,8 +1958,8 @@ static int null_validate_conf(struct nullb_device *dev) return -EINVAL; } - dev->blocksize = round_down(dev->blocksize, 512); - dev->blocksize = clamp_t(unsigned int, dev->blocksize, 512, 4096); + if (blk_validate_block_size(dev->blocksize)) + return -EINVAL; if (dev->queue_mode == NULL_Q_MQ && dev->use_per_node_hctx) { if (dev->submit_queues != nr_online_nodes) -- 2.43.0