From patchwork Sun Nov 6 20:57:38 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyle Huey X-Patchwork-Id: 9414059 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 839E160720 for ; Sun, 6 Nov 2016 20:58:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 74CBC28E19 for ; Sun, 6 Nov 2016 20:58:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 63B0F28F9A; Sun, 6 Nov 2016 20:58:40 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.8 required=2.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_HI,T_DKIM_INVALID autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 1D13C28F94 for ; Sun, 6 Nov 2016 20:58:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751599AbcKFU6R (ORCPT ); Sun, 6 Nov 2016 15:58:17 -0500 Received: from mail-pf0-f196.google.com ([209.85.192.196]:33978 "EHLO mail-pf0-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751119AbcKFU5z (ORCPT ); Sun, 6 Nov 2016 15:57:55 -0500 Received: by mail-pf0-f196.google.com with SMTP id y68so14173936pfb.1 for ; Sun, 06 Nov 2016 12:57:54 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=kylehuey.com; s=google; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=i9shIF9B1DqIZab7tJ2Kn6GXku04l/NDjzEEzA0pq5E=; b=KdttlkKDjBOXQrst1Bv8M3y3vZ1AtDxUlpKGi+HD/I3+jIz5uzlySqbUE1VbruaNFQ GA7LPXvjNGi9iq0yZTvNNebwhUZJ5WehFjF55JDccjJnqs7OPknWr+ZvDm81ivrSqKom uJ9p1KhaZn4wod5d3Yi78RRrXOhH6ps2gWZ7exkjaYarl+ejaj+sxU7MQYjCBFU4Lr6D p19ClNprJgpqspAa/667AFMJvhxcdHKZWHSeX9EPMvHZO38Qe6SjKVnVa4KBLoUjtXGZ 1MfQGqcH6zl2v+zs7vqLXwbuJ9Ev//4bSvRFK4AYUI9h/k9/FfVMUoB8SWytBAuPCw06 ghYQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=i9shIF9B1DqIZab7tJ2Kn6GXku04l/NDjzEEzA0pq5E=; b=aljqAKBaV0sQIbakOhQV0/syvAyQ/wzGL/d4uhysBKg0zCIRB6zMVYvVosbd1JcIy3 /6CDMzdXPvbSUUNWPwrpTOMB7joMFhUU2Ay/YmETNQ71cCNUPHrJWco9uQkYl2qW+wVq 2e3zmOFtcWB1+bmwS4V8pa0Dz+ZMozbVwMoC3cNibC9q2x5Uy+9oBjW5wmimgExM6eV8 xW52+TfbpIkMN4SvGjJ710AxB1GNKmnnYAfNALbFjvfEgBbIGyGPuyoK8i0dMrWS6tQv bEMlq85MJLTxDfsBPaLGwZmOQwwaSGcWPMAqncjcmBG/7aGVRhYgOjyTP9M015er9S+F 3W/g== X-Gm-Message-State: ABUngvc/F28AbvG8cvxWyiy8AbpLZF5cAUgfkLdJ3cR05c/WlmqhznsxNABK9msPvHtMZQ== X-Received: by 10.99.237.69 with SMTP id m5mr5774852pgk.94.1478465873431; Sun, 06 Nov 2016 12:57:53 -0800 (PST) Received: from minbar.hsd1.ca.comcast.net (c-73-162-102-141.hsd1.ca.comcast.net. [73.162.102.141]) by smtp.gmail.com with ESMTPSA id ix3sm34973893pac.17.2016.11.06.12.57.51 (version=TLS1_2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sun, 06 Nov 2016 12:57:52 -0800 (PST) From: Kyle Huey X-Google-Original-From: Kyle Huey To: Robert O'Callahan , Thomas Gleixner , Andy Lutomirski , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org, Paolo Bonzini , =?UTF-8?q?Radim=20Kr=C4=8Dm=C3=A1=C5=99?= , Jeff Dike , Richard Weinberger , Alexander Viro , Shuah Khan , Dave Hansen , Borislav Petkov , Peter Zijlstra , Boris Ostrovsky , Len Brown , "Rafael J. Wysocki" , Dmitry Safonov , David Matlack Cc: linux-kernel@vger.kernel.org, user-mode-linux-devel@lists.sourceforge.net, user-mode-linux-user@lists.sourceforge.net, linux-fsdevel@vger.kernel.org, linux-kselftest@vger.kernel.org, kvm@vger.kernel.org Subject: [PATCH v9 3/7] x86/arch_prctl: Add do_arch_prctl_common Date: Sun, 6 Nov 2016 12:57:38 -0800 Message-Id: <20161106205742.4042-4-khuey@kylehuey.com> X-Mailer: git-send-email 2.10.2 In-Reply-To: <20161106205742.4042-1-khuey@kylehuey.com> References: <20161106205742.4042-1-khuey@kylehuey.com> Sender: linux-fsdevel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-fsdevel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Add do_arch_prctl_common to handle arch_prctls that are not specific to 64 bits. Call it from the syscall entry point, but not any of the other callsites in the kernel, which all want one of the existing 64 bit only arch_prctls. Signed-off-by: Kyle Huey --- arch/x86/include/asm/proto.h | 1 + arch/x86/kernel/process.c | 5 +++++ arch/x86/kernel/process_64.c | 8 +++++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/arch/x86/include/asm/proto.h b/arch/x86/include/asm/proto.h index 95c3e51..f72b551 100644 --- a/arch/x86/include/asm/proto.h +++ b/arch/x86/include/asm/proto.h @@ -25,13 +25,14 @@ void entry_SYSCALL_compat(void); void entry_INT80_compat(void); #endif void x86_configure_nx(void); void x86_report_nx(void); extern int reboot_force; +long do_arch_prctl_common(struct task_struct *task, int code, unsigned long arg2); #ifdef CONFIG_X86_64 long do_arch_prctl_64(struct task_struct *task, int code, unsigned long arg2); #endif #endif /* _ASM_X86_PROTO_H */ diff --git a/arch/x86/kernel/process.c b/arch/x86/kernel/process.c index 0888a87..d0126b2 100644 --- a/arch/x86/kernel/process.c +++ b/arch/x86/kernel/process.c @@ -579,8 +579,13 @@ unsigned long get_wchan(struct task_struct *p) } fp = READ_ONCE_NOCHECK(*(unsigned long *)fp); } while (count++ < 16 && p->state != TASK_RUNNING); out: put_task_stack(p); return ret; } + +long do_arch_prctl_common(struct task_struct *task, int code, unsigned long arg2) +{ + return -EINVAL; +} diff --git a/arch/x86/kernel/process_64.c b/arch/x86/kernel/process_64.c index 611df20..bf75d26 100644 --- a/arch/x86/kernel/process_64.c +++ b/arch/x86/kernel/process_64.c @@ -612,15 +612,21 @@ long do_arch_prctl_64(struct task_struct *task, int code, unsigned long arg2) break; } return ret; } SYSCALL_DEFINE2(arch_prctl, int, code, unsigned long, arg2) { - return do_arch_prctl_64(current, code, arg2); + long ret; + + ret = do_arch_prctl_64(current, code, arg2); + if (ret == -EINVAL) + ret = do_arch_prctl_common(current, code, arg2); + + return ret; } unsigned long KSTK_ESP(struct task_struct *task) { return task_pt_regs(task)->sp; }