From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id F36453EBF01 for ; Fri, 20 Feb 2026 00:09:02 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=209.85.214.177 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771546144; cv=none; b=kzobJF28GjvsJOeZA3gozqgGzj2R+SXS8DCFfM24d4Br/mMAnCIPnZ714gP2Z6LUVW8vrgcRxX3cGFk7bHcMrvkStYADenMRsiO0o/ztcSLqqvnouqdqWzngvmrHPH+vBkCvEKyPOGe2XhX4H0VTg26Y17JKGPC/GZyD19As66k= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1771546144; c=relaxed/simple; bh=66ZQe69rYy/wMmdohuUcy+qkiZ5/gWAtVFp7B4SGx+I=; h=Message-ID:Subject:From:To:Cc:Date:In-Reply-To:References: Content-Type:MIME-Version; b=KcJ2WW22exYhnnJsLJS4Qe1bcBZta6uxe1nehc1ont3CKp+/icRySd4bQXPu7ihmOWeYo8IwHXk06gs3Y1J8EUa6RpvwKQ2eu/FlBbUlFUXPcwxi2qiC3BIPW+vsKf23hvvseU1aM+rFv/MIXAFvPB54AUttzqRpEzVblkVpZ7k= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com; spf=pass smtp.mailfrom=gmail.com; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b=lRNsTq7g; arc=none smtp.client-ip=209.85.214.177 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=gmail.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=gmail.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="lRNsTq7g" Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-2aadc18f230so9186395ad.3 for ; Thu, 19 Feb 2026 16:09:02 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1771546142; x=1772150942; darn=vger.kernel.org; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:from:to:cc:subject :date:message-id:reply-to; bh=BdyC/D8vx6/e5N53LQNiXx5/xtz1jQw9tXYkyKMUPU0=; b=lRNsTq7gSlMwmY00yiSZw80qEdi6KFtGYD3l7Wi23AmR009yopegXcEDxisFyHqPA1 HgwGTW+LhER1p3Ms2f9wvfqeo5C41r8JEA04XksY2u/5iKszDFocCPXuOt66mOs4uAjQ zLZxpbbsR9W3qW1OGH2vUraHVLqGa0zGKnYHduwdRmY7jU/6f62ldlNCHoJcdgsqib9m ZURHvp8VtSRnr7glaHF19eeV3fanzGNlxHOyniQcczPhbs42HmXufMLeAAx6LSQkLg7m KffJTEWFy3P9DO7pMupJprZxgr3MYwhp1K4k3RuIstKGOCsn1gYTBori+sOA5wIfpFUe 2x5Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1771546142; x=1772150942; h=mime-version:user-agent:content-transfer-encoding:references :in-reply-to:date:cc:to:from:subject:message-id:x-gm-gg :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=BdyC/D8vx6/e5N53LQNiXx5/xtz1jQw9tXYkyKMUPU0=; b=M9RThF+VB6DTAKy/8RdGeiLx5uOGqBulw8kmFVemIlrq1lBnyPczCUjhyeP6QOP/cV fZRIXZncDShTkvhv3wudGQ8cnktpMJ6zh7wJbGVyZEb2Z31Xj2dQxXmQg+KFNxboaesU oq4mEEXTok4aiv8DX5JEfQ45X50EABAvhp95KwuXaK91UM3X/qtwXUO2s+cSoN4lMrwB NIHPne8ubH0P/cg2cCEhXD4hF6m2yGSyNinEktSuMz03WaUK+cyxQm8qfG5bCxv85W6i To8V9H9ErZ3Ez2l6qNeqxrhFTB00K94lyLS8RswC1iNcpncT4q2fiM3WWFsvM2fVppg7 heIA== X-Forwarded-Encrypted: i=1; AJvYcCXKTswCYRCtxC1FMiMFqv/mUtU5ICo2nQIU6jBUgffJx3aVHnkk0vUVCU5iA87Ps+1Iy8GjdXogFqInMxw=@vger.kernel.org X-Gm-Message-State: AOJu0Yzk+OsA5t2XwMDlfU6cCkXKT0G72nSmqUp41hWAYRuKTRyK3kR4 T3Iw/11qiwQqpe4qia8StiGtYGq8Q/YUF3NlvcPymLBycS9UU8A7Wr+L X-Gm-Gg: AZuq6aLQBY4kAZ7D99UAtJdxvoyNv3z787RCAjv3WMvfWPyzgRMSL5ulm7mo1MrzTmB htwNAbzdYrQnBXa8QX6CLJ9fae92435DnWUVzyBno4u4lwRdoPZzrSmwXb7VZ2dUIU+RQgdcqOL DEQ6TNY4WcAmWdihVfiLKW0hXrfRVFhDQ48RoLL7y6bLAKMYhyJ1+qWzNnnbZSJirweTNXaCiqZ kG19caGI5Qo+YbGNEsWO7cMKb5720f6OEIcDuC/P/QPmU2hGVk4NzWdNuaTwvYtcpgnQxRAQrru YeFL7GPvT9g8Ug+j5Vo2RQaNvSm+I8TmhRJBGRHiqRz7+uEx9627N7P/GgVJKa+Gk86DEHp+/KM 2FwVu/owlWArcgXsHYkyLLbs6XdiTbEvkA1jtTXSq/AwAxXGY0qscO1q3fImmVXoXUHyrDChPoG mqKYwXHFVerWOQpOMsczmrQQlEMvNi5vYpFzsnEomUqBeCVx1LmRZkaAL8pKThLA== X-Received: by 2002:a17:903:1248:b0:2aa:dee9:1ad3 with SMTP id d9443c01a7336-2ad174337aemr216680475ad.11.1771546142314; Thu, 19 Feb 2026 16:09:02 -0800 (PST) Received: from [192.168.0.56] ([38.34.87.7]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-2ad1a9d5c58sm188709085ad.59.2026.02.19.16.09.01 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Feb 2026 16:09:01 -0800 (PST) Message-ID: <4a1a2e532459e8636c3f7ecfd4e46ff13042b1b9.camel@gmail.com> Subject: Re: [PATCH bpf v2 11/15] selftests/bpf: Free bpf_object in test_sysctl From: Eduard Zingerman To: Ihor Solodrai , Alexei Starovoitov , Andrii Nakryiko , Daniel Borkmann , Jiri Olsa , Mykyta Yatsenko , Alexis =?ISO-8859-1?Q?Lothor=E9?= Cc: Amery Hung , bpf@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-team@meta.com Date: Thu, 19 Feb 2026 16:08:59 -0800 In-Reply-To: <20260218003041.1156774-12-ihor.solodrai@linux.dev> References: <20260218003041.1156774-1-ihor.solodrai@linux.dev> <20260218003041.1156774-12-ihor.solodrai@linux.dev> Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable User-Agent: Evolution 3.58.1 (3.58.1-1.fc43) Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 On Tue, 2026-02-17 at 16:30 -0800, Ihor Solodrai wrote: > ASAN reported a resource leak due to the bpf_object not being tracked > in test_sysctl. Add obj field to struct sysctl_test to properly clean > up bpf_object if a program was loaded from a file. >=20 > Signed-off-by: Ihor Solodrai > --- Acked-by: Eduard Zingerman > @@ -1471,14 +1472,16 @@ static int load_sysctl_prog_file(struct sysctl_te= st *test) > =C2=A0 return -1; > =C2=A0 } > =C2=A0 > + test->obj =3D obj; > =C2=A0 return prog_fd; > =C2=A0} > =C2=A0 > =C2=A0static int load_sysctl_prog(struct sysctl_test *test, const char *s= ysctl_path) > =C2=A0{ > - return test->prog_file > - ? load_sysctl_prog_file(test) > - : load_sysctl_prog_insns(test, sysctl_path); > + if (test->prog_file) > + return load_sysctl_prog_file(test); > + test->obj =3D NULL; Nit: is this necessary? The way `tests` is defined ->obj will be NULL anywa= y. Looks a bit asymmetrical. > + return load_sysctl_prog_insns(test, sysctl_path); > =C2=A0} > =C2=A0 > =C2=A0static int access_sysctl(const char *sysctl_path, > @@ -1573,7 +1576,10 @@ static int run_test_case(int cgfd, struct sysctl_t= est *test) > =C2=A0 /* Detaching w/o checking return code: best effort attempt. */ > =C2=A0 if (progfd !=3D -1) > =C2=A0 bpf_prog_detach(cgfd, atype); > - close(progfd); > + if (test->obj) > + bpf_object__close(test->obj); > + else if (progfd !=3D -1) > + close(progfd); Nit: close(-1) works fine, as well as bpf_object__close(NULL), so there is no need for 'if' statements here. > =C2=A0 printf("[%s]\n", err ? "FAIL" : "PASS"); > =C2=A0 return err; > =C2=A0}