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 DB3B65A7B8; Tue, 23 Jan 2024 01:45:49 +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=1705974349; cv=none; b=Ti0RPHG0TGFblxeIgn+DdHy4gxgXiVmYChDToxEvgcEFpMCzzqvmBBYovL8+Qx7RQz0xvRorawSWVN5qsUWK1Fy2vqzPx6JggMJWoKcohQRe66f1FVQSuK5mtHm0QWABBP04Do+joUxVykws9svlgNlaw4o2uo7ZjSlSYytr4Z8= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705974349; c=relaxed/simple; bh=YEgBQMDirgHf/Nm3CxJOR0JL4VLzSNRFQfi6P23YbRU=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=tJCEBAscHRMUHK3MOIIcPim6emerhJToXlhWAqLXgJKb6frKOMlw5UzEJDGjtun2FsCogcmqYtBzkDKvNZVKf973Unqop1WOQ/IrxQ6gFd7oHsNub0GumoRoN+JQH+Vr1O53Z5iNTNiZpHUZYj+CirHQZ8Weq1WiCnGuH0i2pdA= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=0WvsuP+d; 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="0WvsuP+d" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 9E6B2C433F1; Tue, 23 Jan 2024 01:45:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1705974349; bh=YEgBQMDirgHf/Nm3CxJOR0JL4VLzSNRFQfi6P23YbRU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=0WvsuP+dlo+ofgGtVuJDdvwmCRE+wt5hDrtUWXdsyg92F8NKU0yMm9B3VOYzx80fW 4jpUwvHbn2uPyD074F0VsfYtaIA8UnTcE77YuwqDqTz9/saI0IwgoLo4At5Ypydjxa Ua/sg9PIN4p4TRtwzB9APAOw1Jux70FE4FsAGZCM= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Sergey Shtylyov , Kees Cook , Sasha Levin Subject: [PATCH 6.6 060/583] pstore: ram_core: fix possible overflow in persistent_ram_init_ecc() Date: Mon, 22 Jan 2024 15:51:51 -0800 Message-ID: <20240122235813.962623006@linuxfoundation.org> X-Mailer: git-send-email 2.43.0 In-Reply-To: <20240122235812.238724226@linuxfoundation.org> References: <20240122235812.238724226@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev 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: Sergey Shtylyov [ Upstream commit 86222a8fc16ec517de8da2604d904c9df3a08e5d ] In persistent_ram_init_ecc(), on 64-bit arches DIV_ROUND_UP() will return 64-bit value since persistent_ram_zone::buffer_size has type size_t which is derived from the 64-bit *unsigned long*, while the ecc_blocks variable this value gets assigned to has (always 32-bit) *int* type. Even if that value fits into *int* type, an overflow is still possible when calculating the size_t typed ecc_total variable further below since there's no cast to any 64-bit type before multiplication. Declaring the ecc_blocks variable as *size_t* should fix this mess... Found by Linux Verification Center (linuxtesting.org) with the SVACE static analysis tool. Fixes: 9cc05ad97c57 ("staging: android: persistent_ram: refactor ecc support") Signed-off-by: Sergey Shtylyov Link: https://lore.kernel.org/r/20231105202936.25694-1-s.shtylyov@omp.ru Signed-off-by: Kees Cook Signed-off-by: Sasha Levin --- fs/pstore/ram_core.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/pstore/ram_core.c b/fs/pstore/ram_core.c index 650e437b55e6..f1848cdd6d34 100644 --- a/fs/pstore/ram_core.c +++ b/fs/pstore/ram_core.c @@ -190,7 +190,7 @@ static int persistent_ram_init_ecc(struct persistent_ram_zone *prz, { int numerr; struct persistent_ram_buffer *buffer = prz->buffer; - int ecc_blocks; + size_t ecc_blocks; size_t ecc_total; if (!ecc_info || !ecc_info->ecc_size) -- 2.43.0