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=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham 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 BDDFBC33CB1 for ; Thu, 16 Jan 2020 16:52:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 8CBFA24673 for ; Thu, 16 Jan 2020 16:52:53 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579193573; bh=18TLQobk9WamORS6tuASBwCzT2OWcQr0TMc4s4k2JGM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=iiOzg15zp5QPE+0K4qFlUBP9drrVwY8LiEiOTx58+hMHhT0lE74IJg+b/gBNF/uSj /IMclrcwyv9b7V7TcMFLaKjkdVKQ2M8X8C7K4a4DMybmcbz8qopGYtg8/aIvvCJWBk bYVOffBK5pJESyb/d97WjteqabgRnvHsLljGZdIs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730479AbgAPQww (ORCPT ); Thu, 16 Jan 2020 11:52:52 -0500 Received: from mail.kernel.org ([198.145.29.99]:36192 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730461AbgAPQwv (ORCPT ); Thu, 16 Jan 2020 11:52:51 -0500 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 053702081E; Thu, 16 Jan 2020 16:52:49 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1579193570; bh=18TLQobk9WamORS6tuASBwCzT2OWcQr0TMc4s4k2JGM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=uvTYi7ctg6VrDJKuVJmP/GdHCunO57X0/7pEtlHAonfYK8KENfSugscQO8hqZbxAk x3XZ3/ztrHvlRZnq/uMfr8VXlxhYz+Na/P9YUTapZZ0Q9dERhRz0s6kJZEv2BIj/og FDRTpdzGo5lgAlicWU3sMqejVxAsJxIsgLAUUNcU= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Andrii Nakryiko , Daniel Borkmann , Sasha Levin , netdev@vger.kernel.org, bpf@vger.kernel.org Subject: [PATCH AUTOSEL 5.4 114/205] libbpf: Make btf__resolve_size logic always check size error condition Date: Thu, 16 Jan 2020 11:41:29 -0500 Message-Id: <20200116164300.6705-114-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200116164300.6705-1-sashal@kernel.org> References: <20200116164300.6705-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org Archived-At: List-Archive: List-Post: From: Andrii Nakryiko [ Upstream commit 994021a7e08477f7e51285920aac99fc967fae8a ] Perform size check always in btf__resolve_size. Makes the logic a bit more robust against corrupted BTF and silences LGTM/Coverity complaining about always true (size < 0) check. Fixes: 69eaab04c675 ("btf: extract BTF type size calculation") Signed-off-by: Andrii Nakryiko Signed-off-by: Daniel Borkmann Link: https://lore.kernel.org/bpf/20191107020855.3834758-5-andriin@fb.com Signed-off-by: Sasha Levin --- tools/lib/bpf/btf.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tools/lib/bpf/btf.c b/tools/lib/bpf/btf.c index 1aa189a9112a..d606a358480d 100644 --- a/tools/lib/bpf/btf.c +++ b/tools/lib/bpf/btf.c @@ -269,10 +269,9 @@ __s64 btf__resolve_size(const struct btf *btf, __u32 type_id) t = btf__type_by_id(btf, type_id); } +done: if (size < 0) return -EINVAL; - -done: if (nelems && size > UINT32_MAX / nelems) return -E2BIG; -- 2.20.1