From mboxrd@z Thu Jan 1 00:00:00 1970 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 mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id C5AE8C433EF for ; Mon, 15 Nov 2021 23:42:43 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id AC2F861A0C for ; Mon, 15 Nov 2021 23:42:43 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1350973AbhKOXpb (ORCPT ); Mon, 15 Nov 2021 18:45:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:45406 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1344101AbhKOTXW (ORCPT ); Mon, 15 Nov 2021 14:23:22 -0500 Received: by mail.kernel.org (Postfix) with ESMTPSA id E196563624; Mon, 15 Nov 2021 18:51:56 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1637002317; bh=jqQBdfUsTlqpcw03DTdGrapHz4I8+P3ZjmDSc5kaC+Y=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ZnNQQmoEB4J9BqMvst2FFY0cd+0/xujeBXc/mIdEEZnwoqt2dVlGQZMy0W47WKSkA XgTYXJgbsGfqUg7XIsFNxp+ylsXU0E0zWvf/QnFzzNgpmu9zYCGq0XkNdedty0KO5N Bd5BrpcMf+xlJhERdzI9ZkVZZFQVsOoYKtk1q+Do= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Andrii Nakryiko , Alexei Starovoitov , Sasha Levin Subject: [PATCH 5.15 519/917] libbpf: Fix off-by-one bug in bpf_core_apply_relo() Date: Mon, 15 Nov 2021 18:00:14 +0100 Message-Id: <20211115165446.370596220@linuxfoundation.org> X-Mailer: git-send-email 2.33.1 In-Reply-To: <20211115165428.722074685@linuxfoundation.org> References: <20211115165428.722074685@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Andrii Nakryiko [ Upstream commit de5d0dcef602de39070c31c7e56c58249c56ba37 ] Fix instruction index validity check which has off-by-one error. Fixes: 3ee4f5335511 ("libbpf: Split bpf_core_apply_relo() into bpf_program independent helper.") Signed-off-by: Andrii Nakryiko Signed-off-by: Alexei Starovoitov Link: https://lore.kernel.org/bpf/20211025224531.1088894-2-andrii@kernel.org Signed-off-by: Sasha Levin --- tools/lib/bpf/libbpf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/lib/bpf/libbpf.c b/tools/lib/bpf/libbpf.c index 51180f300d2e1..7145463a4a562 100644 --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -5138,7 +5138,7 @@ static int bpf_core_apply_relo(struct bpf_program *prog, * relocated, so it's enough to just subtract in-section offset */ insn_idx = insn_idx - prog->sec_insn_off; - if (insn_idx > prog->insns_cnt) + if (insn_idx >= prog->insns_cnt) return -EINVAL; insn = &prog->insns[insn_idx]; -- 2.33.0