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 Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 06621EB64DA for ; Sun, 2 Jul 2023 19:39:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 627468E0081; Sun, 2 Jul 2023 15:39:13 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 5D81E8E007C; Sun, 2 Jul 2023 15:39:13 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 452C48E0081; Sun, 2 Jul 2023 15:39:13 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 329298E007C for ; Sun, 2 Jul 2023 15:39:13 -0400 (EDT) Received: from smtpin27.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 0AA15120164 for ; Sun, 2 Jul 2023 19:39:13 +0000 (UTC) X-FDA: 80967685386.27.2E79837 Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf08.hostedemail.com (Postfix) with ESMTP id 41980160019 for ; Sun, 2 Jul 2023 19:39:11 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=A8GVO2PW; spf=pass (imf08.hostedemail.com: domain of sashal@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (policy=none) header.from=kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1688326751; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=5ColzV5/Lxt3wD0B8vKen31GQmxTJrw7NaN7U3VDrfU=; b=Vjl/v/1rI0fEctmb4ED7rfpAwPgkYNbwCzwFyEXG9c+NlvEQzd2h1G3dCjcDk3wcZwmtc9 jItK8EnzPWihVVueeKeUMWnwl+UDTiJxisCgypK0c0NX7uS9IgOnErM6KYRS119bVjZPYt lKLUcP1cv1twNQyFMoA82CSNx2jNAr4= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688326751; a=rsa-sha256; cv=none; b=8Bg5h7yJpJbM01niv1M1hSU/KdFyChQayz6UezeEsa5aqh8txl7Z7IJjqH04a1aTrssVgu jG8FKJ5D8Vky32cFdWG5ue4bNpNmQG3fR/XsEsSXMOHfi43zxYKiYpt0zFcuDFZiry9TXZ LTpF0k9EU6m1VzXgnUyAQAGYxQ7KR7M= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=A8GVO2PW; spf=pass (imf08.hostedemail.com: domain of sashal@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sashal@kernel.org; dmarc=pass (policy=none) header.from=kernel.org Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 4B7F860C90; Sun, 2 Jul 2023 19:39:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3BED4C433CB; Sun, 2 Jul 2023 19:39:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688326749; bh=qbSmFjkxX3HUcFYifbkogWWlpPQjlc1XuGkAs7z+xus=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=A8GVO2PWCoelwP6GOJDM6eAGJPmAOtwe5fP7TwGURIHyjMAU5N2CuEFuHdMJwZJbZ R4iKCnURDXQznGvpNGI7ZLv9s/ZilZYTE4nNodI4I4Mt2ZA/ov04OVEXsnYJ1syB7h IJmKwB5lGxCE/xdtXbAcDaOAM1AZor0ASqG68GT7AaFDn8M+jBfY0pNDwYJKblIzmO 7kai64nnYittYJCFRHmVNDxzOpepE9uXt7VS2eaYWudRLSlTZGWyd5QYYx5cANWSax mfRNWXSIXrAKXZowyOhQ6O+LZR1jD/fNlLDkmQwLosqhqx6YytoHiRBfr11iZwYw98 NVhLevtUWchew== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Ivan Orlov , Muchun Song , Shakeel Butt , Roman Gushchin , Shuah Khan , Sasha Levin , hannes@cmpxchg.org, mhocko@kernel.org, tj@kernel.org, lizefan.x@bytedance.com, shuah@kernel.org, cgroups@vger.kernel.org, linux-mm@kvack.org, linux-kselftest@vger.kernel.org Subject: [PATCH AUTOSEL 6.1 2/3] selftests: cgroup: Add 'malloc' failures checks in test_memcontrol Date: Sun, 2 Jul 2023 15:39:03 -0400 Message-Id: <20230702193904.1775957-2-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702193904.1775957-1-sashal@kernel.org> References: <20230702193904.1775957-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.1.37 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 41980160019 X-Rspam-User: X-Rspamd-Server: rspam11 X-Stat-Signature: gep813sir9unqk9npcos5oi1e7aot9fy X-HE-Tag: 1688326751-839357 X-HE-Meta: U2FsdGVkX1+TRu3Z3ohOzpIwlTKQpkj2VzyOkdG/ADgwW5SWvW5BCy3sb8XX/U3QJ5tIXreyfcGPr62dflt3NNFwW3gLRHBYKZeUphtyr0ENJmuOqWdp7B7LOVSW8QwGNF8T2Qwi6xUdt2138inw9YUtJfFINQlfRlf+kJPPMtD53fdCe4K934ctpafX2g30Zlne8797MW4HrG253cNycW7mwXBTf8pE+5JenLEzAQl3D08TIALglqiV6eJoFl34KkhhpA/uPOD0HH8jsfHzmlU43/K56GlY4U1S2ho1rnmW3ZpuswFHxMsr54PBIWJkpnLVylvWncUTiL9uHENVKdoEB/eNWeq00w6xGDfHAiANOWtJAS9uxiAuiajVDdjkX3jCa7tcokj+8WpQzsDK4OENxWgd/i3WKoJ6fW7xWm+9bSq7V17y+NxLP0yEyJUGLXcUe2Q2OMaXbg1sEcUccCusZLqWabzhqmJzwb2WZZqwIByaYyhckjy9xFmPWZiAv8hKSEoEHBk4XcXtE+inkXPzSEZ5D9IM+PQXVsSwIJNZiqGMlF2xDFv7YKl4r3bzVa//6Cldac3O8Ee6kp+elSEfVSyp34mN6mmhGTlPjWgGR3Ua0q7m2Z7isroaEsawMPRaa/IlB9VYQm0KEZu4sUqZzIt1nXQjR5SOdx1gO+PnQj9odhRfsZ6YBMzPU0VC4aJXv6KF3oR2Is6vCH3GVmvvekbMAUmCDnEYNbRed4w7ZubJpeP6eZw3LOJuZyoOkhTQ7VZLfTjHdwscMwnpxm/GMYoVYx7ShOftx4Pdci4c1ghImXholx4DfH7oa/cz11jjio8FHk1n9hWSm9UGHPOoXcvGk2qQw9+0sRu7ouES3YRsI2x6CcBFTGmcKeDr+wb/1v1EdCagRJ1JnICoFOPbsIAWz0OMlM72ZSfjKHga5oEf/dNey/dHpWej4uK4k3iuryzHd825kTqyUs8 /uUXXwlR iPnnUsh9eQVRfrgsasoI8GvtMlyt9StDv0iuMcCpPTSw6dTNcwm/3qDmhsMhB8CGjLxIWG2Ym7wbZHnCf5QzMGMHOWr7BH6IhbaaUdbPWiYWDgC+LbQ0mZd6Bxn7x8ZV2+wyb3NbN329HS8D27RoqRqJecXbb7jyTRGPiXedkZOESi3bUN1Nj47lMQmu16bwNA27GLKJ+NdAbkJ2RNT3rlisCxwlhkidNhKTG2w6IMg730QvXtoPcwCl3Hs242MJjdp73pbj2TVHUfdrbU2vckB/11uTnTlfZBwgBQxf8ETFVkpJRPJmibMcBdffbgk69hqdOOVn+Dy9TMH0KmpqDe1zzfNzxGZA7vU7vNbYzyv8OG0X2MLM0zWTIh893wHrFtqGhKcT0WhZW99H7gFnWkrrUwO2sqWhqdApBR8YDW8k9YVv4+eyLcGM+UKQhxuLagBxUUu0CRugWe9PiXmvAM50ZfQUCCBISi/xVwha++IEQPe0EKpzW08xk69MuFtYICnlULF/EutY6HJMdUI4SPS6JbRGH8vH6vK7960WPJmIq6m3Bd+FEa2X6FSKkd2HUyFji80swYtvWRVf2BjERyuOvFmrBtyyrs3y69BmtxxpbXyIcpY9a8+QF5Q== X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: From: Ivan Orlov [ Upstream commit c83f320e55a49abd90629f42a72897afd579e0de ] There are several 'malloc' calls in test_memcontrol, which can be unsuccessful. This patch will add 'malloc' failures checking to give more details about test's fail reasons and avoid possible undefined behavior during the future null dereference (like the one in alloc_anon_50M_check_swap function). Signed-off-by: Ivan Orlov Reviewed-by: Muchun Song Acked-by: Shakeel Butt Acked-by: Roman Gushchin Signed-off-by: Shuah Khan Signed-off-by: Sasha Levin --- tools/testing/selftests/cgroup/test_memcontrol.c | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/tools/testing/selftests/cgroup/test_memcontrol.c b/tools/testing/selftests/cgroup/test_memcontrol.c index 8833359556f38..fe4f9f4302822 100644 --- a/tools/testing/selftests/cgroup/test_memcontrol.c +++ b/tools/testing/selftests/cgroup/test_memcontrol.c @@ -98,6 +98,11 @@ static int alloc_anon_50M_check(const char *cgroup, void *arg) int ret = -1; buf = malloc(size); + if (buf == NULL) { + fprintf(stderr, "malloc() failed\n"); + return -1; + } + for (ptr = buf; ptr < buf + size; ptr += PAGE_SIZE) *ptr = 0; @@ -211,6 +216,11 @@ static int alloc_anon_noexit(const char *cgroup, void *arg) char *buf, *ptr; buf = malloc(size); + if (buf == NULL) { + fprintf(stderr, "malloc() failed\n"); + return -1; + } + for (ptr = buf; ptr < buf + size; ptr += PAGE_SIZE) *ptr = 0; @@ -759,6 +769,11 @@ static int alloc_anon_50M_check_swap(const char *cgroup, void *arg) int ret = -1; buf = malloc(size); + if (buf == NULL) { + fprintf(stderr, "malloc() failed\n"); + return -1; + } + for (ptr = buf; ptr < buf + size; ptr += PAGE_SIZE) *ptr = 0; -- 2.39.2