From patchwork Tue Jun 13 00:44:24 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Krister Johansen X-Patchwork-Id: 692356 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 vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 56BE5C7EE2E for ; Tue, 13 Jun 2023 00:44:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229836AbjFMAod (ORCPT ); Mon, 12 Jun 2023 20:44:33 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:41188 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237655AbjFMAoc (ORCPT ); Mon, 12 Jun 2023 20:44:32 -0400 Received: from bee.birch.relay.mailchannels.net (bee.birch.relay.mailchannels.net [23.83.209.14]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7D8A5E7E for ; Mon, 12 Jun 2023 17:44:27 -0700 (PDT) X-Sender-Id: dreamhost|x-authsender|kjlx@templeofstupid.com Received: from relay.mailchannels.net (localhost [127.0.0.1]) by relay.mailchannels.net (Postfix) with ESMTP id B2C815C1228 for ; Tue, 13 Jun 2023 00:44:26 +0000 (UTC) Received: from pdx1-sub0-mail-a313.dreamhost.com (unknown [127.0.0.6]) (Authenticated sender: dreamhost) by relay.mailchannels.net (Postfix) with ESMTPA id 45F785C1181 for ; Tue, 13 Jun 2023 00:44:26 +0000 (UTC) ARC-Seal: i=1; s=arc-2022; d=mailchannels.net; t=1686617066; a=rsa-sha256; cv=none; b=GhUyCwJzLckIILiSI1OjGRF+CTTJN5uw+RJkHm7BbVRo3obA17180UGe7KEtNgyAZoVkI7 x4/XDAnxhMpOO/1lRDyAFjEFdSsBxN08/mbrUuwTL0fL0K6OzY729a8ncQYvWGMfV30KU0 2bwoOGqmC8yWf6mnE4VJW+3mOvb63tLAwoDLyEBUzSeGlOSFQYs4z18n3BSVtXLFvbrEWB 3KhrBunGAGtj/13Uudm1wXfB1+iorMebJ2v/3LotohEdJ9O/VNXI49+E4OKFC4LSq+isSS rdTPM4rSzup5DT4c5HGcmtDYCerWYPc85SM4BbEtT3ypzoXPVGKIZckESPzNhA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=mailchannels.net; s=arc-2022; t=1686617066; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: dkim-signature; bh=vmQhC6SeaPxx97c+zFJ563SLRjLwlbU/iq8B+BP3oDM=; b=nThvp9hMsMOzORxnNRf34hfxhCB4CYaHEJkXDgGu4T9w1duvmbVa1WPxDdg4k75Jx4AacD 93QhXd85EY9lUII1+0dVWWlqe2msDUHOra2lP5QpjpwUpftiTdf/hjpA6JczgaxJDYVYMo SdqmwSOcEKaNAXl5zvfy7sOmv0Xcc5xbU0r/sWBzuiQ6eeIYqtZk+ytUU9wzyFyvvX+u8a 1097xE2kY4zccvnUuFmhusJ9CBQdhOKTJVVV58oF+xWbVdH9ZxVt/ivWsNC7smEAMwpUZa fVSweXXDOQCd1T7w1GXW05F3p4F/Cf2xwvtaxZfxYsaD1FMRhsBHl56cchHpuw== ARC-Authentication-Results: i=1; rspamd-7c78575475-w6j5z; auth=pass smtp.auth=dreamhost smtp.mailfrom=kjlx@templeofstupid.com X-Sender-Id: dreamhost|x-authsender|kjlx@templeofstupid.com X-MC-Relay: Neutral X-MailChannels-SenderId: dreamhost|x-authsender|kjlx@templeofstupid.com X-MailChannels-Auth-Id: dreamhost X-Relation-Turn: 655f36f43da9fa52_1686617066567_2946418750 X-MC-Loop-Signature: 1686617066567:1044881172 X-MC-Ingress-Time: 1686617066567 Received: from pdx1-sub0-mail-a313.dreamhost.com (pop.dreamhost.com [64.90.62.162]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384) by 100.97.48.103 (trex/6.8.1); Tue, 13 Jun 2023 00:44:26 +0000 Received: from kmjvbox (c-73-93-64-36.hsd1.ca.comcast.net [73.93.64.36]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) (Authenticated sender: kjlx@templeofstupid.com) by pdx1-sub0-mail-a313.dreamhost.com (Postfix) with ESMTPSA id 4Qg8vY1V8Gzw8 for ; Mon, 12 Jun 2023 17:44:25 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=templeofstupid.com; s=dreamhost; t=1686617065; bh=vmQhC6SeaPxx97c+zFJ563SLRjLwlbU/iq8B+BP3oDM=; h=Date:From:To:Cc:Subject:Content-Type; b=bTIfQAi0v35ZalghH08IYi7gkPdgICLUA3+w/CA7XBekZmY+arRr33qiX7O85W04o rpvdgcC4rWEezjTo9KM5bO2pvp2lleBKf40ZQZe8hrbaKhHlHgPWcdp8aEXc81R4Jj ohGM6qvt+BAgKTpSf3/qQoMNjiFfs+6j6X8GsQKY= Received: from johansen (uid 1000) (envelope-from kjlx@templeofstupid.com) id e027c by kmjvbox (DragonFly Mail Agent v0.12); Mon, 12 Jun 2023 17:44:24 -0700 Date: Mon, 12 Jun 2023 17:44:24 -0700 From: Krister Johansen To: bpf@vger.kernel.org Cc: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , Shuah Khan , Ilya Leoshkevich , linux-kernel@vger.kernel.org, linux-kselftest@vger.kernel.org Subject: [PATCH bpf v5 0/2] bpf: fix NULL dereference during extable search Message-ID: MIME-Version: 1.0 Content-Disposition: inline Precedence: bulk List-ID: X-Mailing-List: linux-kselftest@vger.kernel.org Hi, Enclosed are a pair of patches for an oops that can occur if an exception is generated while a bpf subprogram is running. One of the bpf_prog_aux entries for the subprograms are missing an extable. This can lead to an exception that would otherwise be handled turning into a NULL pointer bug. These changes were tested via the verifier and progs selftests and no regressions were observed. Changes from v4: - Ensure that num_exentries is copied to prog->aux from func[0] (Feedback from Ilya Leoshkevich) Changes from v3: - Selftest style fixups (Feedback from Yonghong Song) - Selftest needs to assert that test bpf program executed (Feedback from Yonghong Song) - Selftest should combine open and load using open_and_load (Feedback from Yonghong Song) Changes from v2: - Insert only the main program's kallsyms (Feedback from Yonghong Song and Alexei Starovoitov) - Selftest should use ASSERT instead of CHECK (Feedback from Yonghong Song) - Selftest needs some cleanup (Feedback from Yonghong Song) - Switch patch order (Feedback from Alexei Starovoitov) Changes from v1: - Add a selftest (Feedback From Alexei Starovoitov) - Move to a 1-line verifier change instead of searching multiple extables Krister Johansen (2): bpf: ensure main program has an extable selftests/bpf: add a test for subprogram extables kernel/bpf/verifier.c | 7 ++- .../bpf/prog_tests/subprogs_extable.c | 29 +++++++++++ .../bpf/progs/test_subprogs_extable.c | 51 +++++++++++++++++++ 3 files changed, 85 insertions(+), 2 deletions(-) create mode 100644 tools/testing/selftests/bpf/prog_tests/subprogs_extable.c create mode 100644 tools/testing/selftests/bpf/progs/test_subprogs_extable.c