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 6B37AEB64DA for ; Sun, 2 Jul 2023 19:39:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id DC8F68E0080; Sun, 2 Jul 2023 15:39:05 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id D79E48E007C; Sun, 2 Jul 2023 15:39:05 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C19998E0080; Sun, 2 Jul 2023 15:39:05 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0011.hostedemail.com [216.40.44.11]) by kanga.kvack.org (Postfix) with ESMTP id B1A858E007C for ; Sun, 2 Jul 2023 15:39:05 -0400 (EDT) Received: from smtpin23.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 79AF4AFB3E for ; Sun, 2 Jul 2023 19:39:05 +0000 (UTC) X-FDA: 80967685050.23.CBA8D8C Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf06.hostedemail.com (Postfix) with ESMTP id 9F1DE180017 for ; Sun, 2 Jul 2023 19:39:03 +0000 (UTC) Authentication-Results: imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="ukRw6/JP"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf06.hostedemail.com: domain of sashal@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sashal@kernel.org ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1688326743; 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=TzmgLzUCGgKqHr+WW0+ZLSeKO0Mj620/dwbxm0E8Y2o=; b=LbEl3MX7iWYsWM+GyCT8gd8OoboKBE+9KkZCkf1+IIiyLgxdP521iRS7ikG+BKI6R1LEmR ENJJfJIsDLno2tOGWZgjkmUDMwUwizZKnnKyiLCCvrlAA161CnNT2vrNCvP5HlB92PgHRd jpmZ9G7+yEQiY5qwMgWgXGK1kPZFQVI= ARC-Authentication-Results: i=1; imf06.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b="ukRw6/JP"; dmarc=pass (policy=none) header.from=kernel.org; spf=pass (imf06.hostedemail.com: domain of sashal@kernel.org designates 139.178.84.217 as permitted sender) smtp.mailfrom=sashal@kernel.org ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1688326743; a=rsa-sha256; cv=none; b=p4vf34MBg7M9lUBdLEmgD18U9j3CAQKfqBQ9z4jddRX02AAg5Hy+sF6zR0hBIFgbEmP7se b66+gYOAgzakeZxOOR6od40rwagSn6tNXGls3VPj9S4Pc8lta762YwXo255gBmZViJGFYu jTg4zxbscwQY9Ii8KTSkwzHgoazapo0= 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 BA60860CBB; Sun, 2 Jul 2023 19:39:02 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3DB1AC433C9; Sun, 2 Jul 2023 19:39:00 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1688326742; bh=zoqRFyKFzbksP21+pdzLOmw6DiAmo5NhTPCpktIbKRY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ukRw6/JPWOXW8adLebCiBverfrRRi4ZtQ8wnVWmJ6SbC4oneCPHou9XybBGs5pczU kHKLYIH/bMvPSGXNV9t+AMWc/JqCuifvE/CLaLB6IMHSod8nUd9iq8xFwiH+EMA66H 3GJ6vlPTrzY53RkLfY7at9UHu0I8zeTOSjKD8Q9xt0RE/ATEa9FMVAn907EVSin6EA BNc3gtTe8GiQi6WDIkBnIjuUxDQq0hbpGe5BSU9zLBM1wdk7QFHRWrV+QnPlcRnM7H bdZgLzKg8QKHnrs2oLvKhrhV18Doxjn4HnPVAcvdcmHU2NrQjODr1+Jto9D3EvDIcF xTqBRfa2h6KoA== 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.3 2/3] selftests: cgroup: Add 'malloc' failures checks in test_memcontrol Date: Sun, 2 Jul 2023 15:38:54 -0400 Message-Id: <20230702193855.1775909-2-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230702193855.1775909-1-sashal@kernel.org> References: <20230702193855.1775909-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.3.11 Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 9F1DE180017 X-Rspam-User: X-Rspamd-Server: rspam05 X-Stat-Signature: u9xsp61ng495569jrj3smi3i71dffdwh X-HE-Tag: 1688326743-804744 X-HE-Meta: U2FsdGVkX193zFDM42Z5sx1YolrTt+Ltt9dA90DrRQOfHmiTTZNl35+XWbSnWfzPWCydpyuSXnoz++btdAt9M0WSD1SygEeUAgsh80ZOktS+P/T1wmky0CmtbukpaQKGRvQBS/u2iq+veJ0eT/8SePlMNjknamsP7vuzumHYoyW43TemNXByxWAmYqHwTGqUnOk+bfRiYRORgnawKi58FTAI/TwnaIyZ/lLkhKQ5NiOAa0jL7lUoDdqo2v0k4iERqBv7jeUWH7yOFvnT798JBdwecFy/MKx81RAyq5eBiKMYioN95sB1o8FvNqEJRUGFMIDRaNtjPdkG8jcGHJDuQrSoi2qPeJXKcwtQCtMgEMYL0ZbBqstJEzqgd9VnIgdAPsdktuim0qKzXnjpSyg72HkPeshoBpqXkrypQXehYfgdCYG79VJ0WY9k8omplfqmXgxjFERO1mQAx/20Z0tg5pbf7RsQYiLdWxFJHa1f+KZaBReRST6LAMIDgD69dhTVKcJ7kNI7Zdl5hOviloxFgDfrIbDxUIwSO0+UEWAlZgAaEBemEAAYsZ6bnFR0Awknb9b7PYkxxjPkaDBUaBMpySJOmKK+lpV4G/1RXQX8WIhS1SHLjEyKuzp/Q5xrM8q5MPaYWY+WyQLwW3OqxxsiTyAA2bl3bt+npqsR21nt3soVQ+Al0dpl2vVxIIa1FJq01eV42gUMXwjHORTqUGuwjVPbQiPq+VVG0odncuorhtg6sZjVECVw5prTkGmge9LzlaO6MRvS+bJBXUfwW8NKY6LDZKAVUQreNkNsPJ2pWQ6eGl/V+UD7ZrdYCX/yt8B/G0SjXuf3xD7AYKhHDkmR8etvugjn/htQ0dLUAtEhT2gByu1rqFF83ypA2fUa4B3SdNfPBC8kP/CW3mlYKwOSnWqdHu/s13lEunQsg4x9CuQrN9Yq9kkTKKOSfJ6Q2je5R1fJTiz97la3llH8mLz vM9bhKf6 74Mf/XriD4K/72gZeqy88NCYvmS5G16nl7bW4yOEa1xtEBZjkGqcrtLQJXWwzviGEcwk75v20FwzbelRZESLdj6jRzjV84w6LOWAK0Q6Rmhcjj3jUliRtBsxm1iO56X6pSs69Jz0z66b5bMMMA/DluU6bgYSqJWvFvyz7HVc8iS3aNGIDQyXBWPZd/qMjSfzy0FuxSnUq5LOZglBCrB6A/ZmCIw8qqLwcKEJP9c+zVc1exV0VCwaDK2WG2EURlsgZRwmRIODsPdnkXPOXnyidRq0l4J6loH5yXLFCDsAucB1fUtOedGZ7EmuvimUKbBbKEz3Wc+Ha9derIlUOl90NtrjdfctZWRLd5X/L6JriNKzt6toYQWh/xHtiErKqHesTDy4HOO4CARb4uG+Do5kY6Fmb8czxpwnQY4iHWXZOdIOFimADlnEStbb6fG+4dvbWBSuIMcoaV57JM2gJzBF5u38KaAjBiA7zWfYIZrP56qkL6e3oXiWXOuJZUhnNOy7mvsALe3leQM9D6A4d/9eY/9c7JDswK9O/SxerkQoQmnHoyvDLw862ul9GruLZ79ql6HcOKgDewkGIzCPUITFV1afAMyi/M25ff9H7y2e38g2oXayIRpnaKTMYcg== 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 1e616a8c6a9cf..f4f7c0aef702b 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; @@ -778,6 +788,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