Received: by 2002:a25:ab43:0:0:0:0:0 with SMTP id u61csp999353ybi; Fri, 24 May 2019 15:14:44 -0700 (PDT) X-Google-Smtp-Source: APXvYqynOtjDi8dhZtH7USrlia06npBbKIMkXaX6XFZwjMY0boZ8gLBjpHoTDqs3BjMxMMhzph6w X-Received: by 2002:a17:902:7d83:: with SMTP id a3mr110568726plm.305.1558736084536; Fri, 24 May 2019 15:14:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1558736084; cv=none; d=google.com; s=arc-20160816; b=GnRom8hbY6mvFQQtLC2PusZXHDpP9HfYoG+8Sqkg1f75J6izv3dSK1G9e2vnRQVCzy Y8GY2wFX22qfow0iNv6WBry2Bhan31fvrR/zTwnfF2JYtnF03IWHjlf6AmVBqRMVysQT HcuuAEFAHc+QhtYGzdS9AM34S1Sz8UYMDqj053bXqSxXwktX+0rOUo9ElOijCK9v28Zn WLF+Ad58KqiwyQ+dLkKQNRVMOLyT4B8Qa0S6YSKolyWrQE+6SysYLWgTGTYj2b5MEpSd 3AdNxVvI2/y3rsFPlP6pKlNHVMuCyAC8I//4LIkGxhHjyoD/cdhP5y3+oanLFKi6U8O4 sGCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:cc:to:from:subject:references :mime-version:message-id:in-reply-to:date:dkim-signature; bh=q0pnEpuGpsfO4o4/PpGY6OcjeWOaJUu326iPNm0R3Pc=; b=oUiG8KtOM5AJ5XVy1SPcnMaXfIJ2t34H82++tDRx8GQ+Yy4/LW2lbaLyeHY9MqjIM9 YHsJ4IRHCig9o/5VMQpPG5Eo9f5vwUq9B0XO1bEKXLsmD6D8dPe6v6QzUUxxHlEIfsq0 Qr/Er4T7o0Wev3yNqS+NNNUeZf7Hor6eOa+6FmpL0QuvAKnR/soVuCUJCNUL+936cQVn ThTOIccKZLcZvQ+8HwvNQ1CYR7jGO/ymA9fb2JFJ8dQmo+fuoGFIFDWXor7imUMHvtl0 5J0ylFzPCVddtoYkJdkpeydTxj3+hV7EDaEdDOqRRSwrU/DQg4DqOadtSplwDPL1BcAb MGjA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=RNG0ZKg6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 3si6475186pli.78.2019.05.24.15.14.28; Fri, 24 May 2019 15:14:44 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=RNG0ZKg6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404267AbfEXWLe (ORCPT + 99 others); Fri, 24 May 2019 18:11:34 -0400 Received: from mail-yw1-f73.google.com ([209.85.161.73]:36432 "EHLO mail-yw1-f73.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729348AbfEXWLb (ORCPT ); Fri, 24 May 2019 18:11:31 -0400 Received: by mail-yw1-f73.google.com with SMTP id p123so5034461ywg.3 for ; Fri, 24 May 2019 15:11:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:in-reply-to:message-id:mime-version:references:subject:from:to :cc; bh=q0pnEpuGpsfO4o4/PpGY6OcjeWOaJUu326iPNm0R3Pc=; b=RNG0ZKg6/OghWFPwBoYwNzzYloxIFDIocpLzYRM7vLV5WjfKTdG0n8nzOmvNytNZF6 sfTW8MpEGAm41YabVTVREGIGWD6JHYrXq8KmQPoaszezFCDN1Dxmz5Qbva8y/LYgPCtO ce3D+ayaKaJaDDrKEKplXgZQoRMLisOlwkdsPuJcLrOTxavfI22g+OKZ1MTHn4qK1gA+ cZqSbSqI5bkynak7VLvlSPeenO0NkiFk5E0iq3pq8ibZbXC5xv6IOnQepuR6bpn9v/S/ lV75WhtPEZjzQnpCk6/yGlc9a8T5mp/CvOQgr4k8ZchtltDF/h+lqFOKDiP2tL9xS90Y n0JQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:in-reply-to:message-id:mime-version :references:subject:from:to:cc; bh=q0pnEpuGpsfO4o4/PpGY6OcjeWOaJUu326iPNm0R3Pc=; b=p210sebkjZXYLeEoLgXGU5xc/w6R7bqZMJct3G9xeyyLjesMasY1j8xSp0SBy+KPwc R/QZkTuV+Hi25z4qdYs+edE7Tt+Y4kTxDTd7DVt1op4SG5W3SiZFmUSynMFoId/n4bVg 8rmtuGIKhhi6updSdMsVoEdDXB/8EvQlsm5PRAomKvZB1oSoPnLRXPL+0HTC0cre+v+F ALeXou+3HRcfbvElMONBkRJmPIlnm5pyfoWy5z5yLJ+sqqfDM/wT0rJDeUfyVv98EZUn jKkUYXpv+npWvI3oKab1Ce8ZP7kvtnK2AnNA1gCvHDou6/emDS3SCVCrp4C/UFzanrGB Fa9w== X-Gm-Message-State: APjAAAUWCoNV7AST2Onlf4nRpMfLJCHMMEwWD4z36aCs7u/AGM2ASrM+ 9UTHCl0/TtxXew0+l3MU9bA72JvtVzmrLLRh1Y8= X-Received: by 2002:a81:a34a:: with SMTP id a71mr37463051ywh.318.1558735890589; Fri, 24 May 2019 15:11:30 -0700 (PDT) Date: Fri, 24 May 2019 15:11:18 -0700 In-Reply-To: <20190524221118.177548-1-samitolvanen@google.com> Message-Id: <20190524221118.177548-4-samitolvanen@google.com> Mime-Version: 1.0 References: <20190524221118.177548-1-samitolvanen@google.com> X-Mailer: git-send-email 2.22.0.rc1.257.g3120a18244-goog Subject: [PATCH v3 3/3] arm64: use the correct function type for __arm64_sys_ni_syscall From: Sami Tolvanen To: Catalin Marinas , Will Deacon , Mark Rutland Cc: Kees Cook , Nick Desaulniers , linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, Sami Tolvanen Content-Type: text/plain; charset="UTF-8" Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Calling sys_ni_syscall through a syscall_fn_t pointer trips indirect call Control-Flow Integrity checking due to a function type mismatch. Use SYSCALL_DEFINE0 for __arm64_sys_ni_syscall instead and remove the now unnecessary casts. Signed-off-by: Sami Tolvanen --- arch/arm64/kernel/sys.c | 14 +++++++++----- arch/arm64/kernel/sys32.c | 7 ++----- 2 files changed, 11 insertions(+), 10 deletions(-) diff --git a/arch/arm64/kernel/sys.c b/arch/arm64/kernel/sys.c index 6f91e81165147..d8b35cfe5e94e 100644 --- a/arch/arm64/kernel/sys.c +++ b/arch/arm64/kernel/sys.c @@ -47,22 +47,26 @@ SYSCALL_DEFINE1(arm64_personality, unsigned int, personality) return ksys_personality(personality); } +asmlinkage long sys_ni_syscall(void); + +asmlinkage long __arm64_sys_ni_syscall(const struct pt_regs *__unused) +{ + return sys_ni_syscall(); +} + /* * Wrappers to pass the pt_regs argument. */ #define sys_personality sys_arm64_personality -asmlinkage long sys_ni_syscall(const struct pt_regs *); -#define __arm64_sys_ni_syscall sys_ni_syscall - #undef __SYSCALL #define __SYSCALL(nr, sym) asmlinkage long __arm64_##sym(const struct pt_regs *); #include #undef __SYSCALL -#define __SYSCALL(nr, sym) [nr] = (syscall_fn_t)__arm64_##sym, +#define __SYSCALL(nr, sym) [nr] = __arm64_##sym, const syscall_fn_t sys_call_table[__NR_syscalls] = { - [0 ... __NR_syscalls - 1] = (syscall_fn_t)sys_ni_syscall, + [0 ... __NR_syscalls - 1] = __arm64_sys_ni_syscall, #include }; diff --git a/arch/arm64/kernel/sys32.c b/arch/arm64/kernel/sys32.c index 0f8bcb7de7008..3c80a40c1c9d6 100644 --- a/arch/arm64/kernel/sys32.c +++ b/arch/arm64/kernel/sys32.c @@ -133,17 +133,14 @@ COMPAT_SYSCALL_DEFINE6(aarch32_fallocate, int, fd, int, mode, return ksys_fallocate(fd, mode, arg_u64(offset), arg_u64(len)); } -asmlinkage long sys_ni_syscall(const struct pt_regs *); -#define __arm64_sys_ni_syscall sys_ni_syscall - #undef __SYSCALL #define __SYSCALL(nr, sym) asmlinkage long __arm64_##sym(const struct pt_regs *); #include #undef __SYSCALL -#define __SYSCALL(nr, sym) [nr] = (syscall_fn_t)__arm64_##sym, +#define __SYSCALL(nr, sym) [nr] = __arm64_##sym, const syscall_fn_t compat_sys_call_table[__NR_compat_syscalls] = { - [0 ... __NR_compat_syscalls - 1] = (syscall_fn_t)sys_ni_syscall, + [0 ... __NR_compat_syscalls - 1] = __arm64_sys_ni_syscall, #include }; -- 2.22.0.rc1.257.g3120a18244-goog