lists.openwall.net   lists  /  announce  owl-users  owl-dev  john-users  john-dev  passwdqc-users  yescrypt  popa3d-users  /  oss-security  kernel-hardening  musl  sabotage  tlsify  passwords  /  crypt-dev  xvendor  /  Bugtraq  Full-Disclosure  linux-kernel  linux-netdev  linux-ext4  linux-hardening  linux-cve-announce  PHC 
Open Source and information security mailing list archives
 
Hash Suite: Windows password security audit tool. GUI, reports in PDF.
[<prev] [next>] [thread-next>] [day] [month] [year] [list]
Message-ID: <201703210121.YYd7nqeE%fengguang.wu@intel.com>
Date:   Tue, 21 Mar 2017 01:27:28 +0800
From:   kbuild test robot <fengguang.wu@...el.com>
To:     Kyle Huey <me@...ehuey.com>
Cc:     kbuild-all@...org, linux-kernel@...r.kernel.org,
        tipbuild@...or.com, Thomas Gleixner <tglx@...utronix.de>,
        Andy Lutomirski <luto@...nel.org>
Subject: [tip:x86/process 7/11] arch/x86/um/syscalls_64.c:15:6: error:
 conflicting types for 'arch_prctl'

tree:   https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git x86/process
head:   e9ea1e7f53b852147cbd568b0568c7ad97ec21a3
commit: 17a6e1b8e8e8539f89156643f8c3073f09ec446a [7/11] x86/arch_prctl/64: Rename do_arch_prctl() to do_arch_prctl_64()
config: um-x86_64_defconfig (attached as .config)
compiler: gcc-6 (Debian 6.2.0-3) 6.2.0 20160901
reproduce:
        git checkout 17a6e1b8e8e8539f89156643f8c3073f09ec446a
        # save the attached .config to linux build tree
        make ARCH=um SUBARCH=x86_64

All error/warnings (new ones prefixed by >>):

>> arch/x86/um/syscalls_64.c:15:6: error: conflicting types for 'arch_prctl'
    long arch_prctl(struct task_struct *task, int option)
         ^~~~~~~~~~
   In file included from arch/um/include/asm/processor-generic.h:13:0,
                    from arch/x86/um/asm/processor.h:32,
                    from include/linux/spinlock_up.h:8,
                    from include/linux/spinlock.h:89,
                    from include/linux/rcupdate.h:38,
                    from include/linux/rculist.h:10,
                    from include/linux/pid.h:4,
                    from include/linux/sched.h:13,
                    from arch/x86/um/syscalls_64.c:8:
   arch/x86/um/asm/ptrace.h:81:13: note: previous declaration of 'arch_prctl' was here
    extern long arch_prctl(struct task_struct *task, int option,
                ^~~~~~~~~~
   arch/x86/um/syscalls_64.c: In function 'arch_prctl':
>> arch/x86/um/syscalls_64.c:16:29: error: expected '=', ',', ';', 'asm' or '__attribute__' before ')' token
      unsigned long __user *arg2)
                                ^
>> arch/x86/um/syscalls_64.c:78:1: warning: 'alias' attribute ignored [-Wattributes]
    SYSCALL_DEFINE2(arch_prctl, int, option, unsigned long, arg2)
    ^~~~~~~~~~~~~~~
   In file included from arch/x86/um/syscalls_64.c:10:0:
>> include/linux/syscalls.h:198:21: error: storage class specified for parameter 'SYSC_arch_prctl'
     static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \
                        ^
>> include/linux/syscalls.h:192:2: note: in expansion of macro '__SYSCALL_DEFINEx'
     __SYSCALL_DEFINEx(x, sname, __VA_ARGS__)
     ^~~~~~~~~~~~~~~~~
>> include/linux/syscalls.h:184:36: note: in expansion of macro 'SYSCALL_DEFINEx'
    #define SYSCALL_DEFINE2(name, ...) SYSCALL_DEFINEx(2, _##name, __VA_ARGS__)
                                       ^~~~~~~~~~~~~~~
>> arch/x86/um/syscalls_64.c:78:1: note: in expansion of macro 'SYSCALL_DEFINE2'
    SYSCALL_DEFINE2(arch_prctl, int, option, unsigned long, arg2)
    ^~~~~~~~~~~~~~~
>> include/linux/syscalls.h:198:21: warning: parameter 'SYSC_arch_prctl' declared 'inline'
     static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \
                        ^
>> include/linux/syscalls.h:192:2: note: in expansion of macro '__SYSCALL_DEFINEx'
     __SYSCALL_DEFINEx(x, sname, __VA_ARGS__)
     ^~~~~~~~~~~~~~~~~
>> include/linux/syscalls.h:184:36: note: in expansion of macro 'SYSCALL_DEFINEx'
    #define SYSCALL_DEFINE2(name, ...) SYSCALL_DEFINEx(2, _##name, __VA_ARGS__)
                                       ^~~~~~~~~~~~~~~
>> arch/x86/um/syscalls_64.c:78:1: note: in expansion of macro 'SYSCALL_DEFINE2'
    SYSCALL_DEFINE2(arch_prctl, int, option, unsigned long, arg2)
    ^~~~~~~~~~~~~~~
>> arch/x86/um/syscalls_64.c:78:1: warning: 'always_inline' attribute ignored [-Wattributes]
   In file included from arch/x86/um/syscalls_64.c:10:0:
>> include/linux/syscalls.h:198:21: error: 'no_instrument_function' attribute applies only to functions
     static inline long SYSC##name(__MAP(x,__SC_DECL,__VA_ARGS__)); \
                        ^
>> include/linux/syscalls.h:192:2: note: in expansion of macro '__SYSCALL_DEFINEx'
     __SYSCALL_DEFINEx(x, sname, __VA_ARGS__)
     ^~~~~~~~~~~~~~~~~
>> include/linux/syscalls.h:184:36: note: in expansion of macro 'SYSCALL_DEFINEx'
    #define SYSCALL_DEFINE2(name, ...) SYSCALL_DEFINEx(2, _##name, __VA_ARGS__)
                                       ^~~~~~~~~~~~~~~
>> arch/x86/um/syscalls_64.c:78:1: note: in expansion of macro 'SYSCALL_DEFINE2'
    SYSCALL_DEFINE2(arch_prctl, int, option, unsigned long, arg2)
    ^~~~~~~~~~~~~~~
>> include/linux/syscalls.h:201:2: error: expected '=', ',', ';', 'asm' or '__attribute__' before '{' token
     {        \
     ^
>> include/linux/syscalls.h:192:2: note: in expansion of macro '__SYSCALL_DEFINEx'
     __SYSCALL_DEFINEx(x, sname, __VA_ARGS__)
     ^~~~~~~~~~~~~~~~~
>> include/linux/syscalls.h:184:36: note: in expansion of macro 'SYSCALL_DEFINEx'
    #define SYSCALL_DEFINE2(name, ...) SYSCALL_DEFINEx(2, _##name, __VA_ARGS__)
                                       ^~~~~~~~~~~~~~~
>> arch/x86/um/syscalls_64.c:78:1: note: in expansion of macro 'SYSCALL_DEFINE2'
    SYSCALL_DEFINE2(arch_prctl, int, option, unsigned long, arg2)
    ^~~~~~~~~~~~~~~

vim +/arch_prctl +15 arch/x86/um/syscalls_64.c

     2	 * Copyright (C) 2003 - 2007 Jeff Dike (jdike@...dtoit,linux.intel}.com)
     3	 * Copyright 2003 PathScale, Inc.
     4	 *
     5	 * Licensed under the GPL
     6	 */
     7	
   > 8	#include <linux/sched.h>
     9	#include <linux/sched/mm.h>
    10	#include <linux/syscalls.h>
    11	#include <linux/uaccess.h>
    12	#include <asm/prctl.h> /* XXX This should get the constants from libc */
    13	#include <os.h>
    14	
  > 15	long arch_prctl(struct task_struct *task, int option)
  > 16			unsigned long __user *arg2)
    17	{
    18		unsigned long *ptr = arg2, tmp;
    19		long ret;
    20		int pid = task->mm->context.id.u.pid;
    21	
    22		/*
    23		 * With ARCH_SET_FS (and ARCH_SET_GS is treated similarly to
    24		 * be safe), we need to call arch_prctl on the host because
    25		 * setting %fs may result in something else happening (like a
    26		 * GDT or thread.fs being set instead).  So, we let the host
    27		 * fiddle the registers and thread struct and restore the
    28		 * registers afterwards.
    29		 *
    30		 * So, the saved registers are stored to the process (this
    31		 * needed because a stub may have been the last thing to run),
    32		 * arch_prctl is run on the host, then the registers are read
    33		 * back.
    34		 */
    35		switch (option) {
    36		case ARCH_SET_FS:
    37		case ARCH_SET_GS:
    38			ret = restore_registers(pid, &current->thread.regs.regs);
    39			if (ret)
    40				return ret;
    41			break;
    42		case ARCH_GET_FS:
    43		case ARCH_GET_GS:
    44			/*
    45			 * With these two, we read to a local pointer and
    46			 * put_user it to the userspace pointer that we were
    47			 * given.  If addr isn't valid (because it hasn't been
    48			 * faulted in or is just bogus), we want put_user to
    49			 * fault it in (or return -EFAULT) instead of having
    50			 * the host return -EFAULT.
    51			 */
    52			ptr = &tmp;
    53		}
    54	
    55		ret = os_arch_prctl(pid, option, ptr);
    56		if (ret)
    57			return ret;
    58	
    59		switch (option) {
    60		case ARCH_SET_FS:
    61			current->thread.arch.fs = (unsigned long) ptr;
    62			ret = save_registers(pid, &current->thread.regs.regs);
    63			break;
    64		case ARCH_SET_GS:
    65			ret = save_registers(pid, &current->thread.regs.regs);
    66			break;
    67		case ARCH_GET_FS:
    68			ret = put_user(tmp, arg2);
    69			break;
    70		case ARCH_GET_GS:
    71			ret = put_user(tmp, arg2);
    72			break;
    73		}
    74	
    75		return ret;
    76	}
    77	
  > 78	SYSCALL_DEFINE2(arch_prctl, int, option, unsigned long, arg2)
  > 79	{
    80		return arch_prctl(current, option, (unsigned long __user *) arg2);
    81	}
    82	
    83	void arch_switch_to(struct task_struct *to)
  > 84	{
    85		if ((to->thread.arch.fs == 0) || (to->mm == NULL))
    86			return;
    87	
    88		arch_prctl(to, ARCH_SET_FS, (void __user *) to->thread.arch.fs);
  > 89	}

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation

Download attachment ".config.gz" of type "application/gzip" (7698 bytes)

Powered by blists - more mailing lists

Powered by Openwall GNU/*/Linux Powered by OpenVZ