Received: by 2002:a25:4158:0:0:0:0:0 with SMTP id o85csp920825yba; Fri, 3 May 2019 12:43:02 -0700 (PDT) X-Google-Smtp-Source: APXvYqwcM+DnBJaig+bsjcljfbfc1svKU+h/EZi+1ZQxL0BsyHK1p8Dc1J4uwdVbK5Y49tlXENdB X-Received: by 2002:a62:5445:: with SMTP id i66mr13221477pfb.250.1556912582391; Fri, 03 May 2019 12:43:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1556912582; cv=none; d=google.com; s=arc-20160816; b=Izp0kI7FOM73iFmCjVGNifTjDAxVpx2DiCj2+2EDveN+fXwjD+VZE/eE6vgATOEnkC MWyT+uRYBjsSHzbBfYb2vLD7wWN98HyQwVxBwHlA4tDqyMSU0H0Me6l5PMPx1JChEnaQ yYVV22GErK6XS8LnZgd1KJ4W/rdI5977LRYlpAJXyBKQKglY/IoLae0nBoI5d+FmUlig QkKimNWi1yryZGjvPC8+u+8zfEUOJn8KIiSKQQ/RwJbVDtfQtJCq7JhzYGxFUmgdNZjb on0d3HgN3NFVFOgLZLtXzpoB4oc29wUC60acNK45nVnjyHKdeCD0WVa0xFt6Vhkj/Sgd tR7w== 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:mime-version :message-id:date:dkim-signature; bh=O2Vxsbw2zu+jyE40NtPtRm30b2ngTXxWqx+K4kLTmWE=; b=sQgTETrl91haqSKpIF4S6u8nPgMqNgHbjnsLKNTHW+CJqmXAt+ipVSct/nyG4id7cZ S9NOgcSXu68bZFjd6B+DAa0Xn6flzD+4pw6oOZBwelrvP4k7WxxG8xHBfzU95bczF99d mDNB3w0BQraQY2TmqkG3EnUB/tJTgDqnVFzuiI5zSAzblH15BkmkQbg1jKzCFL2A+X43 061TGsePCOBrxM/nFkE7FYXGofFanca+kQLlPSH4WdTgam0M67A/GnO4joOBTgd4QhAf jJb3gHuNpRj3eIS+Ltxf7gM7gffPDkBbyyAbsSScR9TfUixxCDbMkjwa7/2JOvu2T6Ox /s3g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20161025 header.b=Hx23H1DM; 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 m21si3736152pls.121.2019.05.03.12.42.46; Fri, 03 May 2019 12:43:02 -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=Hx23H1DM; 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 S1727017AbfECTM3 (ORCPT + 99 others); Fri, 3 May 2019 15:12:29 -0400 Received: from mail-pf1-f202.google.com ([209.85.210.202]:50706 "EHLO mail-pf1-f202.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726939AbfECTM3 (ORCPT ); Fri, 3 May 2019 15:12:29 -0400 Received: by mail-pf1-f202.google.com with SMTP id q73so3608482pfi.17 for ; Fri, 03 May 2019 12:12:29 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20161025; h=date:message-id:mime-version:subject:from:to:cc; bh=O2Vxsbw2zu+jyE40NtPtRm30b2ngTXxWqx+K4kLTmWE=; b=Hx23H1DMpzXrHfaM/QpifQPXcTEhJhckBh6ao3h1amBiE+2XYEMYapBwlYSjVB+teN OnUjs9WfrkDDyoXtKzMvz0m8/UMwuPu2YzysOWVEyvOz2FJMdbfyAr6+BxXMOdgkxyP4 hgez0RKWV7cmUXF3NyYb49ErucoSds3mGFaHKpUCg7SZAqukFzga2DsCWeI48XGxZF5f o8lE2Z0PVAATcxT8+puCu5WEB8sHtyfWthy5Hs6ojxP0L3JFg7hyPh9G3CsDq4GluOpo 6mdrmymd0+mw/rGnIInKxlS0khRfKIFBv0OaEMxXmIBpd5PdMC8OuzR3QXB1HZLs9jD5 QJrA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:message-id:mime-version:subject:from:to:cc; bh=O2Vxsbw2zu+jyE40NtPtRm30b2ngTXxWqx+K4kLTmWE=; b=IGs9QCgfW4mNpqOpoKkgu4LZBQ4i6UL4KaxdumpKeHykmc5CSRvCni+IXlcvMeerHt ygDgplbLomGoWxZrHvCTxtNdscwcL4LsPZ2z9RdFHxxs+5sMddLPSF08XLK/Qhub9D5r KFe99SF/V7zMECVPuolNnIdOkhb0AV8ZBYSHBX2MdoLtvBI0uVCq0+VZYJulZCH9I0tJ 5nCMl0U42ay/i0PI5jowFLqqAiUl/6w96Lk97WFdXppK8pUSvgqRaEptbq49WXH01uAA G2pId2sU2iVpNBqsn3YDKFrmwDxTq7XOmlxxE4CTVKDtpqzQzT6nGimrXX6tf6b4aFAO LaJA== X-Gm-Message-State: APjAAAUCsv4NiWemmIOM34wM1cuM7BZwc6OJR0dn/MOHSNx8VbMM+7mv 75ztZLpUfYYsoMnuABUQMp7klD/jLErAGDVGb68= X-Received: by 2002:a65:5c8c:: with SMTP id a12mr12635106pgt.452.1556910748545; Fri, 03 May 2019 12:12:28 -0700 (PDT) Date: Fri, 3 May 2019 12:12:22 -0700 Message-Id: <20190503191225.6684-1-samitolvanen@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.21.0.1020.gf2820cf01a-goog Subject: [PATCH v2 0/3] fix function type mismatches in syscall wrappers 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 These patches fix type mismatches in arm64 syscall wrapper definitions, which trip indirect call checks with Control-Flow Integrity. Changes in v2: - more informative commit message for the syscall_fn_t change - added a patch for fixing sys_ni_syscall Sami Tolvanen (3): arm64: fix syscall_fn_t type arm64: use the correct function type in SYSCALL_DEFINE0 arm64: use the correct function type for __arm64_sys_ni_syscall arch/arm64/include/asm/syscall.h | 2 +- arch/arm64/include/asm/syscall_wrapper.h | 18 +++++++++--------- arch/arm64/kernel/sys.c | 14 +++++++++----- arch/arm64/kernel/sys32.c | 12 ++++++++---- 4 files changed, 27 insertions(+), 19 deletions(-) -- 2.21.0.1020.gf2820cf01a-goog