From patchwork Mon Oct 24 11:28:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10171 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp640777wru; Mon, 24 Oct 2022 13:33:31 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5H3/gWl7UTT3iwqlYQLeynCt54NyAKimf0HUa+n15YuURmOcnMXgPQKzxm8/ZOlvxgO1wE X-Received: by 2002:a17:906:9be9:b0:78d:2f63:10dd with SMTP id de41-20020a1709069be900b0078d2f6310ddmr29058589ejc.479.1666643611011; Mon, 24 Oct 2022 13:33:31 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666643611; cv=none; d=google.com; s=arc-20160816; b=Nz1Jkb2CkypRrkQG4yRAMAtbueW58Ia0cmHyqCob3N8QGnVeyMNAl2AjcztSecc/RX Kfu337/TqU3+OCtTCevvZvzRO1vBNxIof1l237fXIe5MNIrMDylCtwzyCcWfyLqCCVUH QMvbTEcVuM8V4d9xVtc2AI6TM327u2K3xjqgoBIxBegGUaE103yOmZmP5hqdKzow6r2Y UUiUbnlX9gTzb+gDS9W55q2HnZUZrSHKhVrpLwkToZDESMeiB6sWT+OkfM1ylv9LGGbu 062sTewr4ebBH90QYFHydaJgTtmH06GsyixRM/Xs7hStbNU86II8CrjYJP0x0A7KNJv+ wO1w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ZGKXmZx6c7GGQMG0dThiu/iRwzJvoZ+8a2VxQTEloZA=; b=ZRk/gYLe5X19FV/kGBLwt8SBZSQNKe3A4CXfc66wlAIvrM1DTYwKaNi4a/NetFr/XO tNB/JI9hjcCdCNNuuE8ZKIcdI1AZ+VfylYvqIAeDYDvnhSP1gH8SU1P2uAmY3aLlWLbz nub2UfQaXBmYTLGkoTHBZNS7IM4yGUlqQWXLEt4HF77f1+J/Rt92UZvYqf11rQmIdTae o4nZYX3yAuvK5oqZ6TsSUtbxGHt0swmq9kbbjPbvrVQUQua+YggoujJFsV/zb2uv9Nwf Ki9oeu68yCO0LinTgTTgywe/yLqj7uRQJnFOVAQEn/FO3Wl/rpweo+aSJV++XLzINVeo 10Dg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=OEty9wcv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id sa23-20020a1709076d1700b0078d9c0e8971si698527ejc.752.2022.10.24.13.33.06; Mon, 24 Oct 2022 13:33:31 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=OEty9wcv; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S232565AbiJXUXE (ORCPT + 99 others); Mon, 24 Oct 2022 16:23:04 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35670 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234255AbiJXUWD (ORCPT ); Mon, 24 Oct 2022 16:22:03 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 23968303D9; Mon, 24 Oct 2022 11:38:08 -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 ams.source.kernel.org (Postfix) with ESMTPS id 197BCB815C9; Mon, 24 Oct 2022 12:21:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 6D81EC433C1; Mon, 24 Oct 2022 12:21:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614100; bh=uZJSkICK2C34aTV38fU/k4A7DgK2gMN2TrjVjEJdnXM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OEty9wcvIMqtqD52HKr0ri2n7VhGi50iRwwgwVo8jAT5Eh83d5Xf89o1JAjVUGerR 4vhXn0ufdVBmtCPnb1OX0wdCeVH8ssr+4e9eJrenEy7V8Mok3GhGve2QYXN29nixpx H3nCuh3xOJekjsR1VucvV7iW907zW+By27Qk5cq4= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Stanislav Fomichev , Lorenz Bauer , Alexei Starovoitov , Sasha Levin Subject: [PATCH 5.10 115/390] bpf: btf: fix truncated last_member_type_id in btf_struct_resolve Date: Mon, 24 Oct 2022 13:28:32 +0200 Message-Id: <20221024113027.593674651@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113022.510008560@linuxfoundation.org> References: <20221024113022.510008560@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1747602490984889774?= X-GMAIL-MSGID: =?utf-8?q?1747602490984889774?= From: Lorenz Bauer [ Upstream commit a37a32583e282d8d815e22add29bc1e91e19951a ] When trying to finish resolving a struct member, btf_struct_resolve saves the member type id in a u16 temporary variable. This truncates the 32 bit type id value if it exceeds UINT16_MAX. As a result, structs that have members with type ids > UINT16_MAX and which need resolution will fail with a message like this: [67414] STRUCT ff_device size=120 vlen=12 effect_owners type_id=67434 bits_offset=960 Member exceeds struct_size Fix this by changing the type of last_member_type_id to u32. Fixes: a0791f0df7d2 ("bpf: fix BTF limits") Reviewed-by: Stanislav Fomichev Signed-off-by: Lorenz Bauer Link: https://lore.kernel.org/r/20220910110120.339242-1-oss@lmb.io Signed-off-by: Alexei Starovoitov Signed-off-by: Sasha Levin --- kernel/bpf/btf.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/kernel/bpf/btf.c b/kernel/bpf/btf.c index dc497eaf2266..9232938e3f96 100644 --- a/kernel/bpf/btf.c +++ b/kernel/bpf/btf.c @@ -2913,7 +2913,7 @@ static int btf_struct_resolve(struct btf_verifier_env *env, if (v->next_member) { const struct btf_type *last_member_type; const struct btf_member *last_member; - u16 last_member_type_id; + u32 last_member_type_id; last_member = btf_type_member(v->t) + v->next_member - 1; last_member_type_id = last_member->type;