Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.32 as permitted sender) client-ip=23.128.96.32;
From:   Yuran Pereira <yuran.pereira@hotmail.com>
To:     bpf@vger.kernel.org, yonghong.song@linux.dev
Cc:     sinquersw@gmail.com, shuah@kernel.org, ast@kernel.org,
        daniel@iogearbox.net, song@kernel.org, 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,
        linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org,
        Yuran Pereira <yuran.pereira@hotmail.com>
Subject: [PATCH bpf-next v2 2/2] selftests/bpf: Add malloc failure checks in bpf_iter
Date:   Thu, 26 Oct 2023 07:33:19 +0530
Message-ID: <DB3PR10MB6835A2CBEE0EBE31D07FABFAE8DDA@DB3PR10MB6835.EURPRD10.PROD.OUTLOOK.COM>
In-Reply-To: <20231026020319.1203600-1-yuran.pereira@hotmail.com>
References: <20231026020319.1203600-1-yuran.pereira@hotmail.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_|AS2PR10MB7048:EE_
X-MS-Office365-Filtering-Correlation-Id: 162a7a00-ad4b-4418-d38f-08dbd5c80941
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: XZGrevnPyfl5N+f4z5+KfN7ruPEltQYUL79xpX0rJpAB8TGQ76AWrK4ZBoX5wuiXy9vqQ7UHar722yN61+IMwxOKbbRNdOSC2UqnFZmow8lj/FmbmPZfSko4VJljTfumo+ZtGUFdhXIgF/7L2+Ji8f7zYQRcdJjRocAFaylKg39C7l0V6nca8jq6ML7C18zFS7mJFh+6pBDI4FTz+HUxyXZerNmlTzW4JByTEeQz+f60vBRBkip76UReE+WSvFJsgc6AU2cgYLdY1ZaUkKoKBOARxIrmiVx2flRPQAvILZCwJ32W3gSJiBoJyiBYCVBMm0Qlb9Abftv5w7KczuVhqU3XC3VSGGPDORc1DwpfFGW89QOHyAAO5pHr0fqIVilrkrLxPeqDe+myWyrC7cP6GQdFXKmdIwUS7asx+PojQCy0SMtlkLxIk14gTCLs9r5LgUmw3iUHetCQUH+7pEtx9gscBGgZ3WqnUSDhyaY8SE59RacGkEEGHDziPJuNSOtwPZe3FEXD0zO3LA+DU2CLQIfYmJkV6iEco2GdYPDJmaQgYjGZTPVcCFIxeaJvEoKch6uOFHbxeC8Ze/I0ERmQpbSrqd6cdJyG3diWkxAzcK8DYDwxzh0uwkFyBoTLTD6k
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?Ng1RoVViVSSIGz9v9rxWeddrqQZTd074SxDJwqAlI02wnutFr9A6wo9Do+Al?=
 =?us-ascii?Q?aipZvF0od9Lsna4oWDoWyuR3xPS2h0cAxvu31uyl766poLqLXiwFNaLl2eNq?=
 =?us-ascii?Q?dCXLJb7oMCcBQhlFIlLtUhXiU+H8UdMqhyuFX6x4QMla6yV+OXpi02KmeJrr?=
 =?us-ascii?Q?VGGe4+UmayOY4G7iHcpuDj2yQ/FEchRoXsz8nFUy5JQXGzbixUZpuyCTenXH?=
 =?us-ascii?Q?Nwnw4Wkp5YKU3HpF+GGhbA4etXRmOmrWEEg6ycR69Ci+XLUJjyv2Knwv9amS?=
 =?us-ascii?Q?6S1//Ff1KV9/BJBkKcpEyKJekd9VHS3yeuu3mherQgXaWcXlMYzp3X0GvDs/?=
 =?us-ascii?Q?HjALR6eRMyf5nz2kIZz4xB9rnLMFoZ61Qk6htyDKABsLth3Q+X8o27/20PrU?=
 =?us-ascii?Q?iAV/wLLEkE11lbjn7yY1HhRPjMahA0Q7eiudIok1cN+nU6nnul3niFti2ERY?=
 =?us-ascii?Q?9bzZmxeXR4FXTMMNR1Mz053EH4FdTCO2AOMFlun5Lz/r+tILx7ZzeglKdIbR?=
 =?us-ascii?Q?7Lgd8ZXqZLewryK1qRuhmm7+Ta9GEQkoCWAuXld6Hszk5638Dph9yCO7/9hS?=
 =?us-ascii?Q?JI6XJNnVw1VR7zEnfyzQOvNCSI2mPOdicSa5euxyOAbYsBUZK+jyaJt2w+bQ?=
 =?us-ascii?Q?6dwT0e+td4NcIkTRWJdrHUX2b367/0/8J4O9MkyEtq+EwRM5a4HduT2GdMW5?=
 =?us-ascii?Q?TPmwGILyeWhRphJOWOF55DNKF4UztAklqgfHmqWxTjhgn9DgTqJwxd5AwEzu?=
 =?us-ascii?Q?CCxBJPQuq3m9Htyy6FVhBwpZDzNQftNBpw4y2SHqVkc+BhsPlMo+eFpFXM/l?=
 =?us-ascii?Q?VYzUVWy3y4a2YtvEe1+5VA9fUZ+J8dorrJgglQEvUNZ67yayZBgrk8XktXpC?=
 =?us-ascii?Q?hhzL2katSlbDMxn57roxohD9JGhqikLjfM0M/DP6dxNppPZoZxKuefQOTb54?=
 =?us-ascii?Q?1GeJgqiclfWCF3QwPyr4uOOFudUewJ84TB386NSrA0qKnwd4u34C4mzLmakA?=
 =?us-ascii?Q?mHgKzcv18FCJ7K87hxjRQbo7rwLlOcj1TiLvvE5lXvYXEn2+C6Kz4mqw2yvj?=
 =?us-ascii?Q?hzNo66TzpbD94nvlQOW7fzzkfNPJEmNM7SN4/Hy17PBXAdNJh/z4QiEDpGGB?=
 =?us-ascii?Q?IRicfxYW8FLlv7hxE3wsrZkIMATQrGBvCh6uH2daRN0k8k2oZlTzD4JDi67o?=
 =?us-ascii?Q?Av0XyEDbFuOMFqJewmDXZGGf/2Qf810jvUFkYbSmTGJUT5EqGuxtTKQA1Lo?=
 =?us-ascii?Q?=3D?=
X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-6b909.templateTenant
X-MS-Exchange-CrossTenant-Network-Message-Id: 162a7a00-ad4b-4418-d38f-08dbd5c80941
X-MS-Exchange-CrossTenant-AuthSource: DB3PR10MB6835.EURPRD10.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Oct 2023 02:05:33.1714
 (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: AS2PR10MB7048
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 agentk.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 (agentk.vger.email [0.0.0.0]); Wed, 25 Oct 2023 19:06:01 -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 | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
index 7db6972ed952..955d374ba656 100644
--- a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
+++ b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
@@ -698,7 +698,7 @@ static void test_overflow(bool test_e2big_overflow, bool ret1)
 		goto free_link;
 
 	buf = malloc(expected_read_len);
-	if (!buf)
+	if (!ASSERT_OK_PTR(buf, "malloc"))
 		goto close_iter;
 
 	/* do read */
@@ -869,6 +869,8 @@ static void test_bpf_percpu_hash_map(void)
 
 	skel->rodata->num_cpus = bpf_num_possible_cpus();
 	val = malloc(8 * bpf_num_possible_cpus());
+	if (!ASSERT_OK_PTR(val, "malloc"))
+		goto out;
 
 	err = bpf_iter_bpf_percpu_hash_map__load(skel);
 	if (!ASSERT_OK_PTR(skel, "bpf_iter_bpf_percpu_hash_map__load"))
@@ -1046,6 +1048,8 @@ static void test_bpf_percpu_array_map(void)
 
 	skel->rodata->num_cpus = bpf_num_possible_cpus();
 	val = malloc(8 * bpf_num_possible_cpus());
+	if (!ASSERT_OK_PTR(val, "malloc"))
+		goto out;
 
 	err = bpf_iter_bpf_percpu_array_map__load(skel);
 	if (!ASSERT_OK_PTR(skel, "bpf_iter_bpf_percpu_array_map__load"))
-- 
2.25.1