Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:6 as permitted sender) client-ip=2620:137:e000::3:6;
From:   Yuran Pereira <yuran.pereira@hotmail.com>
To:     shuah@kernel.org
Cc:     Yuran Pereira <yuran.pereira@hotmail.com>, ast@kernel.org,
        daniel@iogearbox.net, andrii@kernel.org, martin.lau@linux.dev,
        song@kernel.org, yonghong.song@linux.dev, john.fastabend@gmail.com,
        kpsingh@kernel.org, sdf@google.com, haoluo@google.com,
        jolsa@kernel.org, mykolal@fb.com, brauner@kernel.org,
        iii@linux.ibm.com, kuifeng@meta.com, bpf@vger.kernel.org,
        linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH] selftests: bpf: add malloc failures checks in bpf_iter
Date:   Tue, 24 Oct 2023 08:29:00 +0530
Message-ID: <DB3PR10MB683506E8DCCB073A2B75BB10E8DFA@DB3PR10MB6835.EURPRD10.PROD.OUTLOOK.COM>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-MessageSentRepresentingType: 1
X-MS-PublicTrafficType: Email
X-MS-TrafficTypeDiagnostic: DB3PR10MB6835:EE_|PR3PR10MB3850:EE_
X-MS-Office365-Filtering-Correlation-Id: 965f957c-9547-499a-7599-08dbd43d3a61
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: /EIPC+vnzgkazWnVQd/vumHyP38qMxUdRUCzpq8S/30kOYsMQkMyX/Rm5GX8IJ3R2/p/m3cb2HL9AtLOLMZMMIaNzsjTPXmpkGM3GKBkWHEhI6X265KnCrX+qSBZdHIHg6B+19bNY4FAiFXXftTn6gBAcab5DfrGQP5cvBIpN6nGznqDta3piX7sXARb1q/M7jKAT5eZLpQqJ82vsXn+UL1Q8huYY3kZTgWY9JnpfnEeDxGM9Xw5WyHN297EI0SiGbv8reSydO93dqnQRY4Q1xnB/V1T8RDOUabe0XFNzqnBrIPkTWRa6fpJDwhF4QXBl8OVV5/aIw8gVYcGNuSmORVqrAsaGOmGXhnTuKsQi1bppYxP1KmKsglDgPB86x+j9aEqElkd677kjtxROLusX1IqvAS+jmZCE5JcQz59RqhLVI7KxVQnwHtGPsGjkYaWojPKbNJ/WiEmb5H9nxoeCZHNyQ3vH17WVyP9KJ3+JQltggluLqStz+VfRzMH1clZsDLE1/hVhblhSFpmSbWXzW0iczdsGUTW9u/01I/5BagrEug4rZ5+RSp77iwivrBaztqsz9r+HK6+KePEU8eXqIJ9dBl3rh8S5cPl6wEiQLy1X+Trglze2+CegPaxgF9/
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?HLeemc2di5QwegVBakrmvZtLi+u/8jaG7gB06HZkQUDBWBJONUCFwdsvRg0W?=
 =?us-ascii?Q?eLAraSO2zE2zya+3N7DgUhjMNGDIuFAnGemkJLznkJwEQFZRbNgJv3kKBAy8?=
 =?us-ascii?Q?slEfYDu/TAQ9J4snPKQnZx7AEeHvmCoNnHBWDlPnMsvfAtdWPn55T/hvXNCl?=
 =?us-ascii?Q?wrZY7HfUt1loIcaPEbMy7kjs1mZ5roS0CLZ3d7EmoEMw1oq7szBwT5r6cm5O?=
 =?us-ascii?Q?jshuU2+CI0otBnunyfT8Ll4/bQINRssrvdyQOrJNUNnq8ojK1lblN9QtYn3B?=
 =?us-ascii?Q?ohAmHOhYV9tCaHi+EIoJSvQhe2jaGT44frI8sCJ+3STuKdKmy40vZW+3RLYZ?=
 =?us-ascii?Q?Bh6McYVP62T8YmfT9axg0pRpC6m+xY4sR01DgRJj17vjss0uuyMT+E75z8YZ?=
 =?us-ascii?Q?JJwVkTIKUtd3goKQxWliH3X/UabtYDEX+qyJSFZ8pIdwYniDKVSwDTOoB7ti?=
 =?us-ascii?Q?8JNBdtl539Dj4/fsJmFkMmOzIO5d/fRi1IWVHWUylaYRNAuVc2WZWNpDeQnj?=
 =?us-ascii?Q?opUao0q9D54hciNU9VTxm2VLirCOZNRllZr7XJpphL/E3mrGJq0mgJVTj4ev?=
 =?us-ascii?Q?ezisO63PPFPBXGyuQcPZIaIg7wUI2k8Ewasm97geev4BKsSVY3F/dCb8rgdD?=
 =?us-ascii?Q?YOw2+A/fUcpS4vyp2TOk5wm3vYoUVbut1ROTQzoz+o7PMvXTC8ewB1YETREG?=
 =?us-ascii?Q?l4SKg2s73EjenRE/UvKt0St8e0NEfH0BWITvru0NTo2TbFrD71CputTjuq86?=
 =?us-ascii?Q?5lHxliGt6DuFFrux2V2fIm3Bxa41ry0TEc4CDfIdcELDQ6Z7+kSb6fcc/urr?=
 =?us-ascii?Q?P6Au+FgcswdAOJehmIZ/5YluMV1rlCAo7IZcDj7d4w8ZUjdwZrwLCZzYdiyq?=
 =?us-ascii?Q?rZg7Ks8gL2YqMNMXd/UwEeloYadruJ89j66v0+Mosm02XEd9i0Myy1HgZPug?=
 =?us-ascii?Q?j6ueyiRkfQlR6Mq3Um1xByf4TbOqadqnhpyTiuPABdxMUbPUmf/tQ0xvQmRy?=
 =?us-ascii?Q?qgY4uOAG/Tj8rM14+t+k4a02zW6J1To+Q6M8YeR6vMAfUz+q5rbzNdt8NsnR?=
 =?us-ascii?Q?PQdC++x8Fvjc+2mg2LHxIy2sRgD1zgnXv76jqkAEOmV3chhznJf3mI67T1zg?=
 =?us-ascii?Q?c24ZzJD1QLmSMeJQTnlkyTcLtOmJv2KIqpK+jOmkzp+pIlPfVh5UA8DlvIs/?=
 =?us-ascii?Q?lLhr90qZaeORSm6pdqdoFwu/IimSWyv31OZU2t4MoNUHBSKVSx38AQAZcO8?=
 =?us-ascii?Q?=3D?=
X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-6b909.templateTenant
X-MS-Exchange-CrossTenant-Network-Message-Id: 965f957c-9547-499a-7599-08dbd43d3a61
X-MS-Exchange-CrossTenant-AuthSource: DB3PR10MB6835.EURPRD10.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 24 Oct 2023 02:59:24.5162
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa
X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PR3PR10MB3850
X-Spam-Status: No, score=0.6 required=5.0 tests=DKIM_SIGNED,DKIM_VALID,
	DKIM_VALID_AU,FORGED_HOTMAIL_RCVD2,FREEMAIL_FORGED_FROMDOMAIN,
	FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,
	SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.6
X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on pete.vger.email
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (pete.vger.email [0.0.0.0]); Mon, 23 Oct 2023 20:00:02 -0700 (PDT)

Since some malloc calls in bpf_iter may at times fail,
this patch adds the appropriate fail checks, and ensures that
any previously allocated resource is appropriately destroyed
before returning the function.

Signed-off-by: Yuran Pereira <yuran.pereira@hotmail.com>
---
 tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
index 1f02168103dd..6d47ea9211a4 100644
--- a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
+++ b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
@@ -878,6 +878,11 @@ static void test_bpf_percpu_hash_map(void)
 
 	skel->rodata->num_cpus = bpf_num_possible_cpus();
 	val = malloc(8 * bpf_num_possible_cpus());
+	if (CHECK(!val, "malloc", "memory allocation failed: %s",
+				strerror(errno))) {
+		bpf_iter_bpf_percpu_hash_map__destroy(skel);
+		return;
+	}
 
 	err = bpf_iter_bpf_percpu_hash_map__load(skel);
 	if (!ASSERT_OK_PTR(skel, "bpf_iter_bpf_percpu_hash_map__load"))
@@ -1057,6 +1062,11 @@ static void test_bpf_percpu_array_map(void)
 
 	skel->rodata->num_cpus = bpf_num_possible_cpus();
 	val = malloc(8 * bpf_num_possible_cpus());
+	if (CHECK(!val, "malloc", "memory allocation failed: %s",
+				strerror(errno))) {
+		bpf_iter_bpf_percpu_hash_map__destroy(skel);
+		return;
+	}
 
 	err = bpf_iter_bpf_percpu_array_map__load(skel);
 	if (!ASSERT_OK_PTR(skel, "bpf_iter_bpf_percpu_array_map__load"))
-- 
2.25.1