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=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS 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 5C8FEC433DF for ; Sat, 1 Aug 2020 17:03:39 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 3214C206E9 for ; Sat, 1 Aug 2020 17:03:39 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1596301419; bh=PKP90pdjozvVqH2ffc26Z4f+ZoqQEYDX4pMu3kN1ovw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=RAq2Mj1Zw1P2lfFOYaBOYFBUHqkMNYXWv0wDasAWuM1h24J1udsWMkA31lzjPIbVS 9vN6buCq4VuVIqOKKTNa0S2j2KDJQ3+O8ToKSoj+0GJo6q01VAEhPCOq4uD7gDM4u2 WIzeYAgiw8hzgW3UgBzt3xrTpWws295gQK79sKFc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1727813AbgHARDi convert rfc822-to-8bit (ORCPT ); Sat, 1 Aug 2020 13:03:38 -0400 Received: from us-smtp-delivery-1.mimecast.com ([207.211.31.120]:28907 "EHLO us-smtp-1.mimecast.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1726748AbgHARDh (ORCPT ); Sat, 1 Aug 2020 13:03:37 -0400 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-269-wLsO2qkUM-6xiqdBUMR_gw-1; Sat, 01 Aug 2020 13:03:32 -0400 X-MC-Unique: wLsO2qkUM-6xiqdBUMR_gw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 498E318839C2; Sat, 1 Aug 2020 17:03:30 +0000 (UTC) Received: from krava.redhat.com (unknown [10.40.192.39]) by smtp.corp.redhat.com (Postfix) with ESMTP id 032075F7D8; Sat, 1 Aug 2020 17:03:26 +0000 (UTC) From: Jiri Olsa To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko Cc: netdev@vger.kernel.org, bpf@vger.kernel.org, Song Liu , Yonghong Song , Martin KaFai Lau , David Miller , John Fastabend , Wenbo Zhang , KP Singh , Brendan Gregg , Florent Revest , Al Viro Subject: [PATCH v9 bpf-next 01/14] tools resolve_btfids: Add size check to get_id function Date: Sat, 1 Aug 2020 19:03:09 +0200 Message-Id: <20200801170322.75218-2-jolsa@kernel.org> In-Reply-To: <20200801170322.75218-1-jolsa@kernel.org> References: <20200801170322.75218-1-jolsa@kernel.org> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: kernel.org Content-Type: text/plain; charset=WINDOWS-1252 Content-Transfer-Encoding: 8BIT Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org To make sure we don't crash on malformed symbols. Signed-off-by: Jiri Olsa --- tools/bpf/resolve_btfids/main.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tools/bpf/resolve_btfids/main.c b/tools/bpf/resolve_btfids/main.c index 6956b6350cad..e0929620abc6 100644 --- a/tools/bpf/resolve_btfids/main.c +++ b/tools/bpf/resolve_btfids/main.c @@ -199,9 +199,16 @@ static char *get_id(const char *prefix_end) /* * __BTF_ID__func__vfs_truncate__0 * prefix_end = ^ + * pos = ^ */ - char *p, *id = strdup(prefix_end + sizeof("__") - 1); + int len = strlen(prefix_end); + int pos = sizeof("__") - 1; + char *p, *id; + if (pos >= len) + return NULL; + + id = strdup(prefix_end + pos); if (id) { /* * __BTF_ID__func__vfs_truncate__0 -- 2.25.4