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 0D698C77B7F for ; Sat, 29 Apr 2023 01:58:59 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 781006B0071; Fri, 28 Apr 2023 21:58:59 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 730386B0074; Fri, 28 Apr 2023 21:58:59 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 5F8CC6B0075; Fri, 28 Apr 2023 21:58:59 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id 4CED56B0071 for ; Fri, 28 Apr 2023 21:58:59 -0400 (EDT) Received: from smtpin06.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id 1B849A036F for ; Sat, 29 Apr 2023 01:58:59 +0000 (UTC) X-FDA: 80732770398.06.1C3007C Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf11.hostedemail.com (Postfix) with ESMTP id 5F1824000A for ; Sat, 29 Apr 2023 01:58:57 +0000 (UTC) Authentication-Results: imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ETVDfQFp; spf=pass (imf11.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=1682733537; 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=Mj3bEnEZPO7UEPwXpZ7owiY1Kj7+xC9uFVOmgaYgYz4AzaGYGa1m+6tURK75YU9ncYLgsw T/kXXLs/L34REn+rLJBBjQAqWLACMHzgd9OYSvwehXTCyxBlRhsDXVZOhM18iYxx3cQYno NtmSFf9+OslFOHETPidoXVMsxbdQ6uo= ARC-Authentication-Results: i=1; imf11.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=ETVDfQFp; spf=pass (imf11.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=1682733537; a=rsa-sha256; cv=none; b=uvB6quvmv5w8frgo166aNg/mTEXmon1FgFehQQzopWdp4McRDFKVU2XbewZ82fKrkmvGmo UK+zs1BwxXDAmpkBTfPh1mIjtQNHN0lXAFkivY0EPZiO7iEv1d12N6J1fC4m2adTOeNyNs hPUlWkz/3fVvOBYU4hdW19LqEt9kGAc= 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 5D6776179B; Sat, 29 Apr 2023 01:58:56 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4ACD2C433A1; Sat, 29 Apr 2023 01:58:54 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682733535; bh=zoqRFyKFzbksP21+pdzLOmw6DiAmo5NhTPCpktIbKRY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ETVDfQFp8Y+vqBcpJB0h6XagxYvEvbxh1PkzPxgRG1b+6CCRO7Kk199Xy0lCPNVqm pCZ2dw12DVGn879IctYEsZ1I8edMf5Ss8TCeUNJH1wVGbX4ljWwdf71JeHlfAGspLt blPGIoX5SCee7xa9ULddDdizlNZc7krtA4mq9Zv6bAYlb8ZgKnrxZv5FVbcxv91x6o l1EQDexyIEUaVLmTbiEMGygjFm31IbNgTwUxDBDmmRWARFTe69w+quRzQ86ngZnqxV C88+zHDRm2o+GPxkI+QsZuvqu1xLleeIwXvwncwrUutVicljSecRUgiTIiHR8Unbdv 0wqLTVp9938fA== 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: Fri, 28 Apr 2023 21:58:49 -0400 Message-Id: <20230429015850.3027243-2-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230429015850.3027243-1-sashal@kernel.org> References: <20230429015850.3027243-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Rspamd-Queue-Id: 5F1824000A X-Stat-Signature: awt4bj13saimou97igft1a9pp3tecjy7 X-Rspam-User: X-Rspamd-Server: rspam08 X-HE-Tag: 1682733537-17538 X-HE-Meta: U2FsdGVkX19OCM6+o7Kny39KrTH7nCkFMBnmkrygbmMsvlhmg0h4t9dcZ7gkgR/9c47ih9jdsXuTYcO4jIPzDgMEmtPtbimERSgJ5wp8nKj6mFZPZBaZJJP7WKfUSnqJXk/NZyWQB6Awro+PSP42RTmGqdbPwrwSIsWMB2GootLMpJ3RWiQ6ihLu87doeen1xZLWTOH8rrnDc9ej13t1yUYjShP6Bt4Is8gFC2jsZpN4OjIgPedq9lfzrwKpYSe2Sj9uMMygBCg1p4o7AnOykFF6179HdwfGoo4lS+rrxeAhw9qqLBGhyu3ihh+ob3o/K3VZOcZNVr1Nn9IYn7OkqAT+GzeHEVXJZ0nlwKp5/j3qJJUOuB7fhtqbiBNE8qgWljJCpN+dsf9sxyt3kIonPrl8E/UTf8Uvm/WyDlftVZ5Z8E+3pssiPY3N7lVTESxmhlHUf0yvwNo6zOhZbFXOYTWBFkLbdKhOevJtM+ZM14k8j0IYUOjoc6L8NAEevtzAYW10pVtYNGaRTi3oOVotIGC31BgxXYl5ZxDthCXh0S0uqMSaDcWILQfUYry7NkAxmFYtNQLQaqG+BJ74Kz/UguOtdZBTL+QL/a08zqGC9vLmGVXgixcWUR920Daz5hsvLGlttM7vCjffS3FfXxb8C2ta5drqKJiXtJJyam9ErHQbaxGC1Wk/L3YxFw+0gwB16cK7yEpbSJOj55LNnB794OAT2ep3mMnXKOsvVkXJokJb3kO1PX1yTnnozO02Oz7RPdDD1qhhZpUy4mhT5D9DwxJbAwjZcmaHeetebO81y8eRH8x/GRlx9Y3BpishpNYQrdJ/h4trlLq31m6rIloktPDeO2txxS5+ggcY4RajaAlL2aEK/aLaKinrwDW3RZ/k5nmlaaaHW7cjxJhgyTcctMl1vZMBcV1VHBy2YW5VZHO4QPd93GS8ggKTkSrxw+up8t8ycQ9WuFkW9LH3hY7 FicoTAUT np02LAnaFSFfxKVqzEUJ38eHifyOAyLM1I7FpKlJ9s5iFzMX7kfARxwUczyVJ7ermrZILfoRNm80sE1QnGX9BlBGJBOKpyie6JG9nA68ymGuFpd4WDBGJmmQ9y0ewpPPCdIG1F6Qe5tOZssjRom4sr8X7WMwJYlYcXLREv3mtFYBB6Xy6YI5In47OjwhXTuDyG8cakGDRK8khCK3WeokA6SNCLus68V+MkPVnA5nSyQ3jp2EFL5LlY8+s+I6VgPAC6Gv4mLszV4pAVOYz/3FeaQ5vQoR7boMw1RmywiEsLpDLvQC00Uf0W6BZh2achxHlRybUlD2nVfooXk+SL9BJRe4a4yAR3JF35vUe9Z54XfIHBsDW00XVwuOzFN5xbMcjIqzl7uHDOh6/XzGEFCwNmwRD3/nJ3maQIexv/jnS8wjfOHeSAazyzGNWxaJ5pmTFBDN5rOd4y386cgzbzjeDTUiTD+7e4qhWN/NdHJi0XtptTZejHUEUyhvQHvAizdhbu7vPkSrahFUf+srTFo4yRoMTlBBDdDnYp6+zMNZLL+TY/+NQw78+5EDchgpfvjeGwinYwTq1aRbNZ+gvTIvRWuBhQeG03922JVK/a/wp5GUc2hWz8IHRMmI/cg== 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