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 00E44C77B61 for ; Sat, 29 Apr 2023 01:59:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 906A46B0071; Fri, 28 Apr 2023 21:59:14 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 8B7226B0075; Fri, 28 Apr 2023 21:59:14 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 77F266B0078; Fri, 28 Apr 2023 21:59:14 -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 6748E6B0071 for ; Fri, 28 Apr 2023 21:59:14 -0400 (EDT) Received: from smtpin11.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id 35A061203D8 for ; Sat, 29 Apr 2023 01:59:14 +0000 (UTC) X-FDA: 80732771028.11.BFD69EE Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) by imf16.hostedemail.com (Postfix) with ESMTP id 68D26180006 for ; Sat, 29 Apr 2023 01:59:11 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=pyjLfX5L; spf=pass (imf16.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=1682733551; 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=PHrY/pMb3Ei3oHBWKHEQKpPq5+BUjhZwBunfcJaCKj0NLSckAADmZbPZfEA0XFYuOazfLd OdsyKH8j5c9ARjZVhSum1879sY8z9lHdiiSb/USDL2shDKkafAEerR7OVyYzx2n7/vcbnL CdApV9ssB/Acl/+rlXGWxFzdH1O313o= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=kernel.org header.s=k20201202 header.b=pyjLfX5L; spf=pass (imf16.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=1682733551; a=rsa-sha256; cv=none; b=D8S3IE9BM4vSOBG18Hc/regsRiazEh+GtSRgLH0W5BTfBcaffbMu3+pWl6quWSvNSYOSUw nl/QmwmZCVxC5FOHTAra/2lgYjj0kHgzgSnbWi7LKF1Z1eDEvISg1P8u+BQ3BYCYCklTrD Dg/Tox0uxZ4ZKZMNpQE4I6WORW9AXYQ= 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 81C8464629; Sat, 29 Apr 2023 01:59:10 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6812AC43321; Sat, 29 Apr 2023 01:59:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1682733549; bh=qbSmFjkxX3HUcFYifbkogWWlpPQjlc1XuGkAs7z+xus=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=pyjLfX5LU5Ra+/SHIgAtTuJodvrFxA99Phw/909EJxlxDm4ZsCcLjN5AC/tjxXGxK 42Nt81awIlq3B7nVDbWc0lFV8Kq4JVleAF8LebdtVzoI9JjukPd9w50whpqk/WeMcK 5C9F7MUPuT+TIErq0IJAvBg4tFSI3iQngL1FGKbNEGd2HgDg6OA/fkAsY4iZWHFvNF 9M1qBP/m6zqxPZTWBSjoBzPYoalTQ4Jy1s0jAarAOCzv1ZbSRbrUFr+zGdmlV8Ytbk 8r4FFHpV/3sOkfcG2V15kvNe/1OBQ7UDcjME8xO1cfLEf8bk6+EvJzYKNjfUNHAXnx 1yx/+ThfKVTbQ== 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: Fri, 28 Apr 2023 21:59:03 -0400 Message-Id: <20230429015904.3027337-2-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230429015904.3027337-1-sashal@kernel.org> References: <20230429015904.3027337-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: 68D26180006 X-Stat-Signature: zzz1mm7kmewx4ky77hei9zkxgtdm4jqi X-HE-Tag: 1682733551-214000 X-HE-Meta: U2FsdGVkX19SAFmIr05vD/Pt/FKHcStqmPfSsy58a27nDHihLL/vYRG8a5gzrgKjW8u/2lybvNIW6sj9JE1VtV1UxqyW80SoPt0cHnvwTT8ycwbgWmRL5efFgW8IuJDqV1fZq/FfsfoLI2JKC7DJuIKkjlX70FTohR4yZM4l2MXQtoJLClFa1BMljg/oyy2OHjJIOC6g6SJMZfkUCkkeEGkdPMbmvWGed2mbDynt+SGDJpehXzFn3GnIinKxCjrb5e3NXhOmAur2L0rA8I4hLvfsz4uIvegJL457l6pEwcC0D2tWBXhqIIihGLneHbqhCEeW28mlU60wmvY6H5OTHc5x0Y0nFWF8DncjB6CFff76WjHp535b4mjw6vZimkvIK5sUK4o0/ai/CS+raIvxFlfVLyOM6WZWkRBXOL0sDoV7uIBZAH6VElcnZr3CWD0RmuSIpmBeIb4Isq9drS014IMxQoDjEqzaqLfJXCEaYJc09DeV3Q3k9oNP7t4Sfch3r7r7xF2+3+GKwbUrQGmWkM1qU5gO75dgFt9jgeX0q3kiRgzyLkbQ4vWrjhK4/y56CZzy4xkrkw2xq+CnttCadzIKKUHjgcZwtXM9IkFlPFGp3FW9pKIpxQ/8kBc4c+kifDj2VGIq0DbMGp99gzN6w/YiOIKLXf4h8DbnIL+EnNPPAo+Mk6uB49sWtDhiBSFqi37345gA61fj4WkfujzvnOuVnXrAsaVuVIn8TCT6Tpb1W0hEmk6luk+X2GdQ+CzpEo+3tECefRFNF61krWbwIxUZmJ7eHTFlfPIw26S2wG4u3UUSifM8y5kVwzG8+f9BeIPcRRB3Fyfyho74hynifMbw6wCt9FHWjmi4evFG4UIjKYXdqOPU3mv0eAy73vRJ13Cxls7gJLVbWpXh7pRJT3skRSSxah8DqyefEWF7eYuxPk/FNy3/K/XY4/oHHU6xAAnlcGNawWY9kR99eMZ HVjxvya9 OBPQ5ny6+Z8Rm2xAiFDgsI2xQZDzufV0MIzg+S38sNbrZlyuM67N9QFp02eOwwEHEiSL0BhRrafaRt6eiAGXGkmNnEeDiMYGc8TLhObWv8RCMD6TtEu/Xs09urO5cJ8fqIXy2jHAxgIbo78GP5t869jp4j7Z8X3+jnloPsKfB6YRps0LZffRBm69I/BQ8GvuPw1pVXXj+u6w8jAyijS+JmML9Kaya3d+Ygb55b1wP8NY+bDoVr4K+DgfDMdTqyHhD2lrwkMWaCqO74yb7eQjTOGS+DhouarhWv+22b1es2lHoOhGrDl5SmukIXRhlj/znU12FApkMoMsIT2R2N+7AeswtE0FoDHZWH5q00N6ITYqfvC8xsyLVwzpCcYW3LvUvrtFGNn1JgsKvgaDcC2SsuvbVT2lYGC4U+ICbnZLpN2yMGutxiyQOLi9bpJoJcfi6QL0dHwg+6PcU46njUMiaMV/gAg2S1WruG66+YF8NKNOUfadvIlma33ZYnQUb7A3jPgL+ylgFIG6UAkxiVvF6B3ILvlAfsZpXxaNdKVuHRCdANFzD/37ytjxMEJZpmx2AXkyvyEw4YQ8U1v//v/evH85GVd36sxka/dB/8DYyzVehAZSji4rsVrmmcA== 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