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 CDC85C77B60 for ; Sat, 29 Apr 2023 01:59:06 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 70BC66B0074; Fri, 28 Apr 2023 21:59:06 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 6BB896B0075; Fri, 28 Apr 2023 21:59:06 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 55C836B0078; Fri, 28 Apr 2023 21:59:06 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0014.hostedemail.com [216.40.44.14]) by kanga.kvack.org (Postfix) with ESMTP id 449E16B0074 for ; Fri, 28 Apr 2023 21:59:06 -0400 (EDT) Received: from smtpin09.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay07.hostedemail.com (Postfix) with ESMTP id 04A281603AF for ; Sat, 29 Apr 2023 01:59:05 +0000 (UTC) X-FDA: 80732770692.09.644115D Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf01.hostedemail.com (Postfix) with ESMTP id 4B29440004 for ; Sat, 29 Apr 2023 01:59:04 +0000 (UTC) Authentication-Results: imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=MoSbmnFP; spf=pass (imf01.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=1682733544; 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=bUOBuLDkMdHIM77U9K1kQ83SSbby5ubn0STffuN1D5O7Pr/3eM/6VgHvMfHeImWC0RWxq3 PFhqgcz37aHi1emap0gkh8+0zJnPJDN1TJpbk6DlAstFLbBHL/ZoM3PwTGSx0N/5kTdi+Y Jlo67BnJYnpO62zIPKH7+l+bY2tJAn8= ARC-Authentication-Results: i=1; imf01.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=MoSbmnFP; spf=pass (imf01.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-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1682733544; a=rsa-sha256; cv=none; b=lVIFLg7my68eMXtzjbqfF/VXj8PeSdHQzP60R9Y45GkbUwoMlJVObI/HuL52+X+n2QzCEm jSx3AWrYCIpNS9OyMANGRu7m09TbpFQ/TODleAuXAcilLpgYT+LSJY7LMjnkfuUKeQl7d5 jAgowyEc5H2MLRbimPGOKVJqi26epOA= Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by dfw.source.kernel.org (Postfix) with ESMTPS id 5524661C30; Sat, 29 Apr 2023 01:59:03 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 3E67CC4339C; Sat, 29 Apr 2023 01:59:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682733542; bh=zoqRFyKFzbksP21+pdzLOmw6DiAmo5NhTPCpktIbKRY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MoSbmnFPIZay/pUusbgPUBv9NjZrpIhi4AU93fSnKwQXUfBBLDF47MThtXWXp6NTb xDRmZFwqHDZi1Xwg77NwzMLVTIb4l3WFaGxqbXcWIn49Djbf1hstRT8Q0OyO+KeGiJ YBsnED19zmYjcoE+mCIGGG86+SFmLLeroSOZhXjM6EvzpEljFRANkAfjeawCgFEA45 m2nxUPaqsCe0Pl12TH80wJAl72BHelVqobBMLNH8LHhFock6UniyezY5peDqF1ygIE cPHskQ+onsX7uELj2+rsyeKD88/ZOmVxIftMFIBsFqkvp+PFCcVtLa7PyxQ0DeCsoP Q5d/OhHqwJZTg== 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.2 2/3] selftests: cgroup: Add 'malloc' failures checks in test_memcontrol Date: Fri, 28 Apr 2023 21:58:56 -0400 Message-Id: <20230429015857.3027290-2-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230429015857.3027290-1-sashal@kernel.org> References: <20230429015857.3027290-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 4B29440004 X-Stat-Signature: x8hezagyhh43y7ufyywtimnejrgoju87 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1682733544-731365 X-HE-Meta: U2FsdGVkX1/FWq7WfWc4exRJQhSfvqGb9EPGMkYDDD2yUrLTorwsByj6N7KwCxuIjlszKCQXXmi72QZYgYSXAAr0x0XF1oAw91kyTe8uGiSx7USu0TC7JHMWb5TBE/ZfZb56h8ZC15bTarnEelQWbhX7mm2uV4ruMNUGer4VZ3wNryjn2gQRbV49i8DjceX1bk5hbCcRnQ24y0v5Udkkcv400XJfpbD0n20r2D1d+hAlnBSA4zhP/jn7YQ4QmDZmjKxbhiRUFByeax7petCFd54tZTLog8nrffYdmqhow7lGNQK+jse3FmNWWY7lWTqyBDuxWh+WMnDPfD+VDUVLKACAEeCgV21uIxITWec/5751/QA1uMhqgQgUmTW/a5tuUTWdA4+hSd0dbmkm1DTFsRiorglDlmiu6z7mQPU3rg2/Pnufj/Os8mwr4qxtSrTNopy4qACmBFU0s0tuT8Tq0umGl6HTLhq411VLGucRK9bAa4d5wl1yIPB4C3vFbFJH1S/trJpbiA0K2jDD5C/aQERM15XUGt9MQFLlivVwPI6+umWVDL7eO002U4dbDlEg2dwaMZy7GkYPsrusCAZrohGL3+kA4Osy4H9vkfsU9ZNBBStupRnTtmbrD8cKCibf61YvdGnVJJ1wrhOSPEm2O2DoH25ZOpRm6n24LNrnrPvZA0zmKFiqjYJ442zDkdRi6M5KZM3Y8yCzKiQMbBPBvsEHtIngGIHigQfRoaCGC6115/KgWOsArrtRaOvw8c56IZrM/kYUdVQYcFmf++qSRmcdL9TveYfN8sMbNYnXur+HeZTLuSgs9xOIGZik6BrCp8ghECs8a+maf2+DpHXwIvJIA0SdfzrN8+FazWEPaBrqXOLToc9fphHZXzkZA+WpiobX2ax87v6iOp4vCAfi2t2wYdju1u87fRidaYb1cmW9Hx2MQ/fmke2jgF+iwnOizD15ZQfRsyqPKnjsz9E R+2qlL9B wg7Nu9WDHEE1B0Hf5dDjNtjiDGLx6XliSlzCqdje6v9GzpX6DqbujOWZP5tyZhtY36VS4E0St8PE38V5/cqOzEdt2HDJ3tB2gqkrixVeFpswZIkw8w0/u/F/LU2LD/ZIWori95XZmRHtnuqeMDn4/GhCmZd+HylgS2WUbAhZpcKA8258HgGP7R614/fNK+h7uQy0NhnbieyUg8LE7pbeB4vgJmumOiw/c1f2v/WOWNvMqVpXvqm5s0XRUbNyQutEo4r31bfV8boYVxOLfbaSFR0H6I3Cn2dc95nuAHfVzFSuYFRTZ+YMtHALW7oQs1LrPDFiXVbvy3iLnb1MzP03QbjzHH+Ws2XLw1phoVashtCfP75Fv2QvMUqp1qSJkn82CAHjoaH7a7tSuInSHcglIBCNim4NWT1lmbbhWRu/cIKsbqXc2NEHZsnP6mzROujmM0HW+MFxurSnAehl2hM+RKJrgUC0TiaME5yh0sMr5aacFGia0ebDf8MF9xxnnS41c+uPnSUNgqV9TQ3OhkaBqRul7S3LFU7JcbcI09k0Zww7vP3imZZ+KnAhaUVF3+prWU1dR0dEK/lVHYMYaxcHTX4a6BMr6u/s+z/dzd1uoGcVb5zYzxSdeQfQ7bQ== 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