Received: by 2002:a05:6358:5282:b0:b5:90e7:25cb with SMTP id g2csp3293638rwa; Tue, 23 Aug 2022 02:09:10 -0700 (PDT) X-Google-Smtp-Source: AA6agR4Lg9NTxGfFkgiPeYTo0A35baSM7diNUthHRQDZhzk9O/gPEYgODl9PSkiO94RzLm0mUXLs X-Received: by 2002:a17:906:cc4a:b0:73d:a494:5205 with SMTP id mm10-20020a170906cc4a00b0073da4945205mr718357ejb.737.1661245750076; Tue, 23 Aug 2022 02:09:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1661245750; cv=none; d=google.com; s=arc-20160816; b=HDyRF2YlwgML4IH5Ov8WnbnVhIKDi+/defKRsc91nH/18XNclQcYoBb9tA4TGMWUnr 88WGAqWfCBKfkHWb56u7am8X8uWiWJ+L3RZBZhS7GsWRZ9GOs1j3hoGTl2WXODWlNJsb 32aGJUqabDo/9v4BzsWP9QPeUowcLKwcda/nOCXkJqJmVf60dCuyHZbkQ5sm8EgNSOTg Eflr16t3xfDryajN3y7ITyXXkkcT9fzs4zX1ulgm4h6I17JIAx1ubJS/uzexlqty8wLZ GIz6LtHJouspAJgI/z1f7sZ25I7X00w7R+zeqpOs++LySBnDHLgAh3wQvJMsSpqH9zId 8mbg== 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=4kuePEELNrO5DeECftQv/PScOzPZo/Zg8/tOHfYRoUU=; b=WyOX7OmVaakqDkEYJc4aXqruhjhRwi1wV1QI5ZrfwlCP/nxPe+QA/JgfJc2WkKuWyK +vh+XF2g1UuCBpZQy3cxBr0s+DksYkbvSgaycEaWLyLIjdSyx0eSUs814Bl9iTmeCR4b 8AbFRzoOEM8fn0VhT9MKOFDrRwhTY6QK1wATQv4AjCvGx5bzU2uk2AFPTzM6E9ls8zRN FFL+2K2VKYnZWTYxKdHkKKp8BNqoDOav+TWfD7mTEKnuGNY9aOi7EIRZHCyidtbqaoG/ gUn7EfjkNe8hoGzamWv+1vFa64aa6VPgKiRDQ575+xF7TZe/6BYm0tlf3Bx0vvFTylCE yuPQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=oAuCcV10; 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 Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id 17-20020a508e51000000b0044202060b7csi1598531edx.430.2022.08.23.02.08.41; Tue, 23 Aug 2022 02:09:10 -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=oAuCcV10; 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 S242279AbiHWI7t (ORCPT + 99 others); Tue, 23 Aug 2022 04:59:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42372 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S240927AbiHWI73 (ORCPT ); Tue, 23 Aug 2022 04:59:29 -0400 Received: from dfw.source.kernel.org (dfw.source.kernel.org [IPv6:2604:1380:4641:c500::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id F07A180B66; Tue, 23 Aug 2022 01:26:50 -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 dfw.source.kernel.org (Postfix) with ESMTPS id 1B27161360; Tue, 23 Aug 2022 08:19:52 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 24C1CC433C1; Tue, 23 Aug 2022 08:19:50 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1661242791; bh=fxlNh0LwhOpWUkF19exROe077tMNe7vdcr/NJnAVD5A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=oAuCcV10qcmtI3bqAlMvDjqK7MSK5Hnzj1oN5+8A3CCUcG/5Cvd5PvnoUeubj451y R74hFoBTm3vWapuc3LRQtf0NQiE3tG+ncQ7S/YLWj92yllrfUx9e/S3JB+UelUzaTs ELYFsYbBR2WIs7r1nQpgbWX2rE6sxwW89E8xnT+k= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Al Viro , Dinh Nguyen Subject: [PATCH 5.19 168/365] nios2: traced syscall does need to check the syscall number Date: Tue, 23 Aug 2022 10:01:09 +0200 Message-Id: <20220823080125.245315943@linuxfoundation.org> X-Mailer: git-send-email 2.37.2 In-Reply-To: <20220823080118.128342613@linuxfoundation.org> References: <20220823080118.128342613@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.1 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,T_SCC_BODY_TEXT_LINE 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 From: Al Viro commit 25ba820ef36bdbaf9884adeac69b6e1821a7df76 upstream. all checks done before letting the tracer modify the register state are worthless... Fixes: 82ed08dd1b0e ("nios2: Exception handling") Signed-off-by: Al Viro Signed-off-by: Dinh Nguyen Signed-off-by: Greg Kroah-Hartman --- arch/nios2/kernel/entry.S | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) --- a/arch/nios2/kernel/entry.S +++ b/arch/nios2/kernel/entry.S @@ -255,9 +255,9 @@ traced_system_call: ldw r6, PT_R6(sp) ldw r7, PT_R7(sp) - /* Fetch the syscall function, we don't need to check the boundaries - * since this is already done. - */ + /* Fetch the syscall function. */ + movui r1, __NR_syscalls + bgeu r2, r1, traced_invsyscall slli r1, r2, 2 movhi r11,%hiadj(sys_call_table) add r1, r1, r11 @@ -287,6 +287,11 @@ end_translate_rc_and_ret2: RESTORE_SWITCH_STACK br ret_from_exception + /* If the syscall number was invalid return ENOSYS */ +traced_invsyscall: + movi r2, -ENOSYS + br translate_rc_and_ret2 + Luser_return: GET_THREAD_INFO r11 /* get thread_info pointer */ ldw r10, TI_FLAGS(r11) /* get thread_info->flags */