From nobody Fri Sep 5 20:07:56 2025 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id B2A29C32793 for ; Tue, 23 Aug 2022 11:27:44 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1357459AbiHWL0H (ORCPT ); Tue, 23 Aug 2022 07:26:07 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51842 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1357598AbiHWLUh (ORCPT ); Tue, 23 Aug 2022 07:20:37 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A07888A7EA; Tue, 23 Aug 2022 02:22:38 -0700 (PDT) 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 13E7460F91; Tue, 23 Aug 2022 09:22:37 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1A127C433D6; Tue, 23 Aug 2022 09:22:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661246556; bh=HjDiRdLsmkxdk+6DMHCfnH7hzFf5FMbx2Yo3Ti6EXPw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ILRRpBCQhpYdM0xJdTsXDKzksngRX7LavdfxD+eHsFw3zJPkQRwpBYSIyEDpUc+UU YSwBpPHT/Z3n9uSQcSX68KmLC0xHH+Gm9PVJiYpE9Bs7jShHcvP3yQfXrxVBfVC6iL zk08HhEmdDeAHmHdEFhz3zLHVyQa1CFtYDu6Tgs0= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Dan Carpenter , Martin KaFai Lau , Alexei Starovoitov , Sasha Levin Subject: [PATCH 5.4 130/389] selftests/bpf: fix a test for snprintf() overflow Date: Tue, 23 Aug 2022 10:23:28 +0200 Message-Id: <20220823080121.055266754@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080115.331990024@linuxfoundation.org> References: <20220823080115.331990024@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Type: text/plain; charset="utf-8" From: Dan Carpenter [ Upstream commit c5d22f4cfe8dfb93f1db0a1e7e2e7ebc41395d98 ] The snprintf() function returns the number of bytes which *would* have been copied if there were space. In other words, it can be > sizeof(pin_path). Fixes: c0fa1b6c3efc ("bpf: btf: Add BTF tests") Signed-off-by: Dan Carpenter Acked-by: Martin KaFai Lau Link: https://lore.kernel.org/r/YtZ+aD/tZMkgOUw+@kili Signed-off-by: Alexei Starovoitov Signed-off-by: Sasha Levin --- tools/testing/selftests/bpf/test_btf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/test_btf.c b/tools/testing/selftes= ts/bpf/test_btf.c index 3d617e806054..996eca57bc97 100644 --- a/tools/testing/selftests/bpf/test_btf.c +++ b/tools/testing/selftests/bpf/test_btf.c @@ -4808,7 +4808,7 @@ static int do_test_pprint(int test_num) ret =3D snprintf(pin_path, sizeof(pin_path), "%s/%s", "/sys/fs/bpf", test->map_name); =20 - if (CHECK(ret =3D=3D sizeof(pin_path), "pin_path %s/%s is too long", + if (CHECK(ret >=3D sizeof(pin_path), "pin_path %s/%s is too long", "/sys/fs/bpf", test->map_name)) { err =3D -1; goto done; --=20 2.35.1