From patchwork Mon Oct 24 11:32:26 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 10138 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp636702wru; Mon, 24 Oct 2022 13:22:35 -0700 (PDT) X-Google-Smtp-Source: AMsMyM5P5+RVF10OZvGVzZj0Dby+nalOMveeKzh0W+HWEB0f8GfuyxMK4kJK6Q490Nc5Lwg6055w X-Received: by 2002:a05:6402:1045:b0:461:a28b:17ab with SMTP id e5-20020a056402104500b00461a28b17abmr8915534edu.90.1666642954898; Mon, 24 Oct 2022 13:22:34 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666642954; cv=none; d=google.com; s=arc-20160816; b=H//W/ZVaOfONcp5bhY7JyzchkWIewqAC4qOwqXSOnsdfjTmKauyuYn/Oq8rwVA3V+k GTVYljTSWnxv2TXCKUvEEA52zJwZlyWLYDspFv8NM6KO1pM4mHFLxHOrycSm/bno9Rup k21it3VOwff3FQPB9Ztu1qLnZ7tiFVtpyiVcJB21xozDQy/D25eOqekXaTvyxZSpPr5v 0I6Kr6T0ypRxiCK+6MSWM6bTQ70CruyptHSuKm+zWycv/+SF7Js5CiaQz097CcgkoPK0 ZX/T21U6vE+Sf+/UV/6oLy3A5/Gg/hsq5PM7pQCVyppeG+M5TqvSdg9G5fOa2GV0QUVm d1Rg== 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=a/obIfrV/ZrAqOk2Ixy7N2LciTGeONRCGwaF/82QJgM=; b=lx0saS1kr6rj0UOuq98PrVoDA1CpvazUNO/CHIBqSgwPiAA4CXcAKomOwC4QpH8Drx aPliKmdMITV3fV7fRTBes/g2FaBSWhKNZDLt6izcO47u81iWMJz84EYNeNe7mi3EJQxx LbIvsL5KqfgR5rD12F0t0S3LcPdc3AVPSgDiCTVUEgAlU9vBBr32OLGHyOnhCAqsF9lk oUiSig0Ok79rO3TAA70yCz+C89X7IOqi+mT+8BtdS+WDVOpemhKzosFvqmh/rvGIUEtj C9DE9NG6gW39vPyuqTt2VlsZA8Dtkl1yLYE+iXFq8uH7bgcVRnA5Wa08FiXrkFahcPGX i0Qg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=NBBT95jK; 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 e18-20020aa7d7d2000000b00460f0ff4906si619587eds.130.2022.10.24.13.22.10; Mon, 24 Oct 2022 13:22:34 -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=NBBT95jK; 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 S234037AbiJXUQJ (ORCPT + 99 others); Mon, 24 Oct 2022 16:16:09 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:37108 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234013AbiJXUPi (ORCPT ); Mon, 24 Oct 2022 16:15:38 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 9879EA98DD; Mon, 24 Oct 2022 11:33:00 -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 0D331B816FF; Mon, 24 Oct 2022 12:31:30 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4F81CC43141; Mon, 24 Oct 2022 12:31:28 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666614688; bh=4jU+b9rw56L/HuCT8xKDJBBo+NptefMm9VOF60OgbkA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=NBBT95jKmEw7o0q3KwoQlVrzUMHUA9nX4Prjdn+Q5tUIcFzqufGZuHpVhdt3zhdgI yk8BvbmDH+i0BUIBGu0iUrypZBqAWON/MeWB0lyQz1I+TdjfzdJ/nuUpph4JQaHGGQ 1Dhopz41IXHBbxj4AC+5D2EujeB0ZkBBxzFMdpTM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Mark Brown , Catalin Marinas , Sasha Levin Subject: [PATCH 5.10 349/390] kselftest/arm64: Fix validatation termination record after EXTRA_CONTEXT Date: Mon, 24 Oct 2022 13:32:26 +0200 Message-Id: <20221024113037.846538203@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?1747601803174676145?= X-GMAIL-MSGID: =?utf-8?q?1747601803174676145?= From: Mark Brown [ Upstream commit 5c152c2f66f9368394b89ac90dc7483476ef7b88 ] When arm64 signal context data overflows the base struct sigcontext it gets placed in an extra buffer pointed to by a record of type EXTRA_CONTEXT in the base struct sigcontext which is required to be the last record in the base struct sigframe. The current validation code attempts to check this by using GET_RESV_NEXT_HEAD() to step forward from the current record to the next but that is a macro which assumes it is being provided with a struct _aarch64_ctx and uses the size there to skip forward to the next record. Instead validate_extra_context() passes it a struct extra_context which has a separate size field. This compiles but results in us trying to validate a termination record in completely the wrong place, at best failing validation and at worst just segfaulting. Fix this by passing the struct _aarch64_ctx we meant to into the macro. Signed-off-by: Mark Brown Link: https://lore.kernel.org/r/20220829160703.874492-4-broonie@kernel.org Signed-off-by: Catalin Marinas Signed-off-by: Sasha Levin --- tools/testing/selftests/arm64/signal/testcases/testcases.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/arm64/signal/testcases/testcases.c b/tools/testing/selftests/arm64/signal/testcases/testcases.c index 61ebcdf63831..a3ac5c2d8aac 100644 --- a/tools/testing/selftests/arm64/signal/testcases/testcases.c +++ b/tools/testing/selftests/arm64/signal/testcases/testcases.c @@ -33,7 +33,7 @@ bool validate_extra_context(struct extra_context *extra, char **err) return false; fprintf(stderr, "Validating EXTRA...\n"); - term = GET_RESV_NEXT_HEAD(extra); + term = GET_RESV_NEXT_HEAD(&extra->head); if (!term || term->magic || term->size) { *err = "Missing terminator after EXTRA context"; return false;