Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.31 as permitted sender) client-ip=23.128.96.31;
From:   Yuran Pereira <yuran.pereira@hotmail.com>
To:     yonghong.song@linux.dev
Cc:     Yuran Pereira <yuran.pereira@hotmail.com>, shuah@kernel.org,
        ast@kernel.org, daniel@iogearbox.net, andrii@kernel.org,
        martin.lau@linux.dev, 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, bpf@vger.kernel.org,
        linux-kselftest@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH bpf-next] selftests/bpf: Add malloc failure checks in bpf_iter
Date:   Wed, 25 Oct 2023 07:22:45 +0530
Message-ID: <DB3PR10MB68356D7CDF6005480BE5876CE8DEA@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_|DU0PR10MB6082:EE_
X-MS-Office365-Filtering-Correlation-Id: 7a1e6cfd-9f35-4e24-5f4b-08dbd4fd4523
X-Microsoft-Antispam: BCL:0;
X-Microsoft-Antispam-Message-Info: JrvTy+DA+gUgra2isufIZkB6idG8gQCtimV0Cz0R1B1nffGUYSOW8VwpxX+h8MnhJGfgo00Jyz/XfuZEla31+XfSTRs5jTNen3DjY+Ip/QBXBT6FQM4HHG2dEkO80QTkjKLudiBKQEmq9g16txGpv+CDPTQFvJYzhQplVeIjm82AsN9yIRnapKmnr29vcuA4gfgRzLcRl8WGNe1HwHTIroPdGAADvqJ24LRBQVHCJ7iDLVJV9akIM0ngTznE165iz5ZOdjlHkuPXRDQWRuHY+RjZizFcXXT0s6oVBOttB0MtowQAeSTcaTAdfLzm8xPP8edsRA1cT0aBPqqp7n/BgFkYhX5/+ikG1cAeymVnQ4DLA5ZWrJd8OoFmgDKj8k9kevn5Zp0mCCKHW9qFUzgIRKoQxSD15MjeF1YUf6Iw5Uk+swAzQcDrZ5dHEVoywI1t0k35C0Fve9nl7Tvu/avE4aUjgda7NXfFsrtXqyYqEfQMcNJ10PcestxU+PB39B9JSH0EPRH6+qk5PGiABAgFdnbUYcA+31Zde9wl/pkUkI1DBEVAWUHaSym6Ygfriw5d1cOuUO1lfuHsJc40aSIpYK2m5ez6P9w14lW+1T80InE=
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?s0IBQFB+9g5i48WB8H+HMXh229w+KWy8LHWRp39CrLCyjhGpbBoD+KOF8tgb?=
 =?us-ascii?Q?FRfGgO1Gf0M4EqibNtOGP+M79bf9rwz5RUFMJsmr/mhH7BdO1iF7phHMPpMS?=
 =?us-ascii?Q?f9cL62/NWp/MSkOdelJghFHdqZdK+s+nlQIhaCnzUdXopxgKXLOGkNlhsKZj?=
 =?us-ascii?Q?O8Nsm/8BM8CUbJ5Wk5wzLPGtvUqPsyO1Tae3h8kVRem6dUGq1JoD6EgIfJk6?=
 =?us-ascii?Q?UrJeqnX+g+Zsst358XA1glMURgw4FwlCaBkPOOABYYoHktsHpLisnMjmSBKx?=
 =?us-ascii?Q?kXRIdByi8buSX0/uB7SwYSQg7rjIg7BInAyO7UWE1Rw3Z+2Iuqe89W8rG5My?=
 =?us-ascii?Q?xq/6sTMGAjamJf/By93x+tDVglYd6oQiq1GrZosGF0MZnJcsj96yj1Ezr5BJ?=
 =?us-ascii?Q?7c9dIivCWb5gWODmcFOQlkD6kkJRHMcw12dZ/z1cbmPDwemQqalKYAgKFGkm?=
 =?us-ascii?Q?5FjiGxaMOl4hq7PxbhyOeNRD8NjUUb/dymkBsnvK54oJpd2TIrX6nXOAaCZT?=
 =?us-ascii?Q?GYYw4VSyMlvj6nNKBtdreEb/Rv98JX80hpVcudpdLKi2dIzZ/z1bvk4g2kLC?=
 =?us-ascii?Q?C2+p5oVRvP7kYCyRyUH9ZewYCZTVZ/tCGp2fMGMeNdLDX1Yea7A6J3jWD0Va?=
 =?us-ascii?Q?R/gEzesIUZ0SOS5wfQOo35wvapsHA2D26sClp3UgQ8Aap+7lUKXuLk1nKsq0?=
 =?us-ascii?Q?aRRPM0ti0F8PI1o35vScUk8gYWiJfDj4qa0Kc0uOgiPygE+zfm2quWWI14gl?=
 =?us-ascii?Q?OcKr8ApVJRCUUAsjOve9nae26VM/g5HGAMpWf/vnGmHGXAFla1ZFAHD+ZV6r?=
 =?us-ascii?Q?uyJM+0rimxVpdUZuBqpSml2iWY/uNXQQ+E1MgheQO/DWULMKvy0VHSF8NVe2?=
 =?us-ascii?Q?otRpni2g8DUyZXvGHVjsHC3YBA+4ykBnhqhooWBnPAjbCQig16JlNBdv3qTu?=
 =?us-ascii?Q?qbz4i1cddt5Pd5YygSVjhkvGy5/ZUVmDs+q8AGGs0awZQmL+uuDNyeZcSPWa?=
 =?us-ascii?Q?r109Iycz1Ck6xCLeNSrnvuLXXVlXLt4+v8AcodZkLbH81vXGNDYhCO6uJwYc?=
 =?us-ascii?Q?ph4OIDF+VXIODuKmVSwLLNW2IFVTfTrTYAESDyQRnLUQ5/Z2u8y7ldHffvYH?=
 =?us-ascii?Q?hbTWT2RMMCqLtjp6Dxkx48NGdi0RKVmfRHIQQga4VPQKwcZNYrAnRhhQP0Jc?=
 =?us-ascii?Q?Gg/te05wYdtlEXEn2oCP5XWe8C/MMeGWUn3LTR5q4mtoVnWOkqVzAdjzRNg?=
 =?us-ascii?Q?=3D?=
X-OriginatorOrg: sct-15-20-4755-11-msonline-outlook-6b909.templateTenant
X-MS-Exchange-CrossTenant-Network-Message-Id: 7a1e6cfd-9f35-4e24-5f4b-08dbd4fd4523
X-MS-Exchange-CrossTenant-AuthSource: DB3PR10MB6835.EURPRD10.PROD.OUTLOOK.COM
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 Oct 2023 01:54:05.8644
 (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: DU0PR10MB6082
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 morse.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 (morse.vger.email [0.0.0.0]); Tue, 24 Oct 2023 18:54:19 -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.

This is patch 2 in the sequence should be applied after d1a88d37cecc
"selftests/bpf: Convert CHECK macros to ASSERT_* macros in bpf_iter"

Patch 1:
https://lore.kernel.org/lkml/DB3PR10MB683589A5F705C6CA5BE0D325E8DFA@DB3PR10MB6835.EURPRD10.PROD.OUTLOOK.COM

Signed-off-by: Yuran Pereira <yuran.pereira@hotmail.com>
---
 tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 10 +++++++++-
 1 file changed, 9 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 526ac4e741ee..c6cf42c64af3 100644
--- a/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
+++ b/tools/testing/selftests/bpf/prog_tests/bpf_iter.c
@@ -700,7 +700,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 */
@@ -871,6 +871,10 @@ 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")) {
+		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"))
@@ -1048,6 +1052,10 @@ 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")) {
+		bpf_iter_bpf_percpu_array_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