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 X-Spam-Level: X-Spam-Status: No, score=-6.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 37238C352A4 for ; Mon, 10 Feb 2020 13:19:25 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 082B220863 for ; Mon, 10 Feb 2020 13:19:25 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581340765; bh=7wmqfI+e//pB7XG7ri04ugNCB6heo9KllchceUBRJj4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZlJSWuj/Crru66y4fzlRDpXT6/jdwgmxMF4ET1j91ipNgOX9CO1lUKpDYjpERiFtJ egvQjoK6uNN2IyRg/W1fkttS7AM74V29tlG9NTOydyODQBQ5s6IlOfq0pb97pMhnW/ DljSeR6WMDRgz5ToRdpXQqVcMvpfJcKfHWC43liU= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729098AbgBJNTN (ORCPT ); Mon, 10 Feb 2020 08:19:13 -0500 Received: from mail.kernel.org ([198.145.29.99]:60232 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728909AbgBJMhs (ORCPT ); Mon, 10 Feb 2020 07:37:48 -0500 Received: from localhost (unknown [209.37.97.194]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 7F77624650; Mon, 10 Feb 2020 12:37:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1581338267; bh=7wmqfI+e//pB7XG7ri04ugNCB6heo9KllchceUBRJj4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=RpjxifjfXIRP2kOeNe9gYMWO3GmAJ6UQSpngR3HzAsizvtgBf7B10Rst/bKGj5j5T 5DI2RKv27rZJxiFYBXmtMmSkmcpOj4BkvJCGTpGbnLBvWRXDw6wYHKykAg1FbaixHM 1Tm2kHceusrPhoOvGydid9INGCKGkje07NXZaAuQ= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, William Smith , Andrii Nakryiko , Daniel Borkmann , Yonghong Song Subject: [PATCH 5.4 147/309] libbpf: Fix realloc usage in bpf_core_find_cands Date: Mon, 10 Feb 2020 04:31:43 -0800 Message-Id: <20200210122420.451093285@linuxfoundation.org> X-Mailer: git-send-email 2.25.0 In-Reply-To: <20200210122406.106356946@linuxfoundation.org> References: <20200210122406.106356946@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Andrii Nakryiko commit 35b9211c0a2427e8f39e534f442f43804fc8d5ca upstream. Fix bug requesting invalid size of reallocated array when constructing CO-RE relocation candidate list. This can cause problems if there are many potential candidates and a very fine-grained memory allocator bucket sizes are used. Fixes: ddc7c3042614 ("libbpf: implement BPF CO-RE offset relocation algorithm") Reported-by: William Smith Signed-off-by: Andrii Nakryiko Signed-off-by: Daniel Borkmann Acked-by: Yonghong Song Link: https://lore.kernel.org/bpf/20200124201847.212528-1-andriin@fb.com Signed-off-by: Greg Kroah-Hartman --- tools/lib/bpf/libbpf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/tools/lib/bpf/libbpf.c +++ b/tools/lib/bpf/libbpf.c @@ -2541,7 +2541,9 @@ static struct ids_vec *bpf_core_find_can if (strncmp(local_name, targ_name, local_essent_len) == 0) { pr_debug("[%d] %s: found candidate [%d] %s\n", local_type_id, local_name, i, targ_name); - new_ids = realloc(cand_ids->data, cand_ids->len + 1); + new_ids = reallocarray(cand_ids->data, + cand_ids->len + 1, + sizeof(*cand_ids->data)); if (!new_ids) { err = -ENOMEM; goto err_out;