X-Git-Url: http://git.pld-linux.org/?a=blobdiff_plain;f=kernel-vserver-2.3.patch;h=505f10b1cad9cab244084ae0973e99382483b794;hb=d04dff22436394132089ef42ab75a29b99524684;hp=9bf1d63a627816e046fad04dd7620142d48dd8be;hpb=537831f9233c351daa121eac2b1213a6cd1a5564;p=packages%2Fkernel.git diff --git a/kernel-vserver-2.3.patch b/kernel-vserver-2.3.patch index 9bf1d63a..505f10b1 100644 --- a/kernel-vserver-2.3.patch +++ b/kernel-vserver-2.3.patch @@ -1,6 +1,6 @@ -diff -NurpP --minimal linux-3.7/Documentation/vserver/debug.txt linux-3.7-vs2.3.5.1/Documentation/vserver/debug.txt ---- linux-3.7/Documentation/vserver/debug.txt 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/Documentation/vserver/debug.txt 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/Documentation/vserver/debug.txt linux-4.9/Documentation/vserver/debug.txt +--- linux-4.9/Documentation/vserver/debug.txt 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/Documentation/vserver/debug.txt 2021-02-24 15:47:45.047741532 +0100 @@ -0,0 +1,154 @@ + +debug_cvirt: @@ -35,12 +35,12 @@ diff -NurpP --minimal linux-3.7/Documentation/vserver/debug.txt linux-3.7-vs2.3. + "vroot[%d]_get_real_bdev: dev=%p[%lu,%d:%d]" + "vroot[%d]_set_dev: dev=%p[%lu,%d:%d]" + "vroot_get_real_bdev not set" -+ 1 2 "cow_break_link(»%s«)" -+ "temp copy »%s«" ++ 1 2 "cow_break_link(?%s?)" ++ "temp copy ?%s?" + 2 4 "dentry_open(new): %p" + "dentry_open(old): %p" + "lookup_create(new): %p" -+ "old path »%s«" ++ "old path ?%s?" + "path_lookup(old): %d" + "vfs_create(new): %d" + "vfs_rename: %d" @@ -108,7 +108,7 @@ diff -NurpP --minimal linux-3.7/Documentation/vserver/debug.txt linux-3.7-vs2.3. + +debug_tag: + -+ 7 80 "dx_parse_tag(»%s«): %d:#%d" ++ 7 80 "dx_parse_tag(?%s?): %d:#%d" + "dx_propagate_tag(%p[#%lu.%d]): %d,%d" + +debug_xid: @@ -156,10 +156,10 @@ diff -NurpP --minimal linux-3.7/Documentation/vserver/debug.txt linux-3.7-vs2.3. + m 2^m "vx_acc_page[%5d,%s,%2d]: %5d%s" + "vx_acc_pages[%5d,%s,%2d]: %5d += %5d" + "vx_pages_avail[%5d,%s,%2d]: %5ld > %5d + %5d" -diff -NurpP --minimal linux-3.7/arch/alpha/Kconfig linux-3.7-vs2.3.5.1/arch/alpha/Kconfig ---- linux-3.7/arch/alpha/Kconfig 2012-12-11 15:45:43.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/alpha/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -668,6 +668,8 @@ config DUMMY_CONSOLE +diff -urNp -x '*.orig' linux-4.9/arch/alpha/Kconfig linux-4.9/arch/alpha/Kconfig +--- linux-4.9/arch/alpha/Kconfig 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/arch/alpha/Kconfig 2021-02-24 15:47:45.037741219 +0100 +@@ -743,6 +743,8 @@ config DUMMY_CONSOLE depends on VGA_HOSE default y @@ -168,9 +168,9 @@ diff -NurpP --minimal linux-3.7/arch/alpha/Kconfig linux-3.7-vs2.3.5.1/arch/alph source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/alpha/kernel/systbls.S linux-3.7-vs2.3.5.1/arch/alpha/kernel/systbls.S ---- linux-3.7/arch/alpha/kernel/systbls.S 2012-10-04 13:26:43.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/alpha/kernel/systbls.S 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/arch/alpha/kernel/systbls.S linux-4.9/arch/alpha/kernel/systbls.S +--- linux-4.9/arch/alpha/kernel/systbls.S 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/arch/alpha/kernel/systbls.S 2021-02-24 15:47:45.037741219 +0100 @@ -446,7 +446,7 @@ sys_call_table: .quad sys_stat64 /* 425 */ .quad sys_lstat64 @@ -180,23 +180,23 @@ diff -NurpP --minimal linux-3.7/arch/alpha/kernel/systbls.S linux-3.7-vs2.3.5.1/ .quad sys_ni_syscall /* sys_mbind */ .quad sys_ni_syscall /* sys_get_mempolicy */ .quad sys_ni_syscall /* sys_set_mempolicy */ -diff -NurpP --minimal linux-3.7/arch/alpha/kernel/traps.c linux-3.7-vs2.3.5.1/arch/alpha/kernel/traps.c ---- linux-3.7/arch/alpha/kernel/traps.c 2012-12-11 15:45:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/alpha/kernel/traps.c 2012-12-11 15:56:32.000000000 +0000 -@@ -184,7 +184,8 @@ die_if_kernel(char * str, struct pt_regs +diff -urNp -x '*.orig' linux-4.9/arch/alpha/kernel/traps.c linux-4.9/arch/alpha/kernel/traps.c +--- linux-4.9/arch/alpha/kernel/traps.c 2021-02-24 15:47:30.747294162 +0100 ++++ linux-4.9/arch/alpha/kernel/traps.c 2021-02-24 15:47:45.037741219 +0100 +@@ -179,7 +179,8 @@ die_if_kernel(char * str, struct pt_regs #ifdef CONFIG_SMP printk("CPU %d ", hard_smp_processor_id()); #endif - printk("%s(%d): %s %ld\n", current->comm, task_pid_nr(current), str, err); -+ printk("%s(%d[#%u]): %s %ld\n", current->comm, ++ printk("%s(%d:#%u): %s %ld\n", current->comm, + task_pid_nr(current), current->xid, str, err); dik_show_regs(regs, r9_15); - add_taint(TAINT_DIE); + add_taint(TAINT_DIE, LOCKDEP_NOW_UNRELIABLE); dik_show_trace((unsigned long *)(regs+1)); -diff -NurpP --minimal linux-3.7/arch/arm/Kconfig linux-3.7-vs2.3.5.1/arch/arm/Kconfig ---- linux-3.7/arch/arm/Kconfig 2012-12-11 15:45:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/arm/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -2307,6 +2307,8 @@ source "fs/Kconfig" +diff -urNp -x '*.orig' linux-4.9/arch/arm/Kconfig linux-4.9/arch/arm/Kconfig +--- linux-4.9/arch/arm/Kconfig 2021-02-24 15:47:30.757294474 +0100 ++++ linux-4.9/arch/arm/Kconfig 2021-02-24 15:47:45.041074656 +0100 +@@ -2202,6 +2202,8 @@ source "fs/Kconfig" source "arch/arm/Kconfig.debug" @@ -205,9 +205,9 @@ diff -NurpP --minimal linux-3.7/arch/arm/Kconfig linux-3.7-vs2.3.5.1/arch/arm/Kc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/arm/kernel/calls.S linux-3.7-vs2.3.5.1/arch/arm/kernel/calls.S ---- linux-3.7/arch/arm/kernel/calls.S 2012-12-11 15:45:45.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/arm/kernel/calls.S 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/arch/arm/kernel/calls.S linux-4.9/arch/arm/kernel/calls.S +--- linux-4.9/arch/arm/kernel/calls.S 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/arch/arm/kernel/calls.S 2021-02-24 15:47:45.041074656 +0100 @@ -322,7 +322,7 @@ /* 310 */ CALL(sys_request_key) CALL(sys_keyctl) @@ -217,37 +217,24 @@ diff -NurpP --minimal linux-3.7/arch/arm/kernel/calls.S linux-3.7-vs2.3.5.1/arch CALL(sys_ioprio_set) /* 315 */ CALL(sys_ioprio_get) CALL(sys_inotify_init) -diff -NurpP --minimal linux-3.7/arch/arm/kernel/process.c linux-3.7-vs2.3.5.1/arch/arm/kernel/process.c ---- linux-3.7/arch/arm/kernel/process.c 2012-12-11 15:45:45.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/arm/kernel/process.c 2012-12-11 15:56:32.000000000 +0000 -@@ -337,7 +337,8 @@ void __show_regs(struct pt_regs *regs) - void show_regs(struct pt_regs * regs) - { - printk("\n"); -- printk("Pid: %d, comm: %20s\n", task_pid_nr(current), current->comm); -+ printk("Pid: %d[#%u], comm: %20s\n", -+ task_pid_nr(current), current->xid, current->comm); - __show_regs(regs); - dump_stack(); - } -diff -NurpP --minimal linux-3.7/arch/arm/kernel/traps.c linux-3.7-vs2.3.5.1/arch/arm/kernel/traps.c ---- linux-3.7/arch/arm/kernel/traps.c 2012-10-04 13:26:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/arm/kernel/traps.c 2012-12-11 15:56:32.000000000 +0000 -@@ -249,8 +249,8 @@ static int __die(const char *str, int er +diff -urNp -x '*.orig' linux-4.9/arch/arm/kernel/traps.c linux-4.9/arch/arm/kernel/traps.c +--- linux-4.9/arch/arm/kernel/traps.c 2021-02-24 15:47:30.797295726 +0100 ++++ linux-4.9/arch/arm/kernel/traps.c 2021-02-24 15:47:45.041074656 +0100 +@@ -279,8 +279,8 @@ static int __die(const char *str, int er print_modules(); __show_regs(regs); -- printk(KERN_EMERG "Process %.*s (pid: %d, stack limit = 0x%p)\n", -- TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), end_of_stack(tsk)); -+ printk(KERN_EMERG "Process %.*s (pid: %d:#%u, stack limit = 0x%p)\n", -+ TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, end_of_stack(tsk)); +- pr_emerg("Process %.*s (pid: %d, stack limit = 0x%p)\n", +- TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), end_of_stack(tsk)); ++ pr_emerg("Process %.*s (pid: %d:%u, stack limit = 0x%p)\n", ++ TASK_COMM_LEN, tsk->comm, task_pid_nr(tsk), tsk->xid, end_of_stack(tsk)); if (!user_mode(regs) || in_interrupt()) { dump_mem(KERN_EMERG, "Stack: ", regs->ARM_sp, -diff -NurpP --minimal linux-3.7/arch/cris/Kconfig linux-3.7-vs2.3.5.1/arch/cris/Kconfig ---- linux-3.7/arch/cris/Kconfig 2012-12-11 15:46:01.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/cris/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -670,6 +670,8 @@ source "drivers/staging/Kconfig" +diff -urNp -x '*.orig' linux-4.9/arch/cris/Kconfig linux-4.9/arch/cris/Kconfig +--- linux-4.9/arch/cris/Kconfig 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/arch/cris/Kconfig 2021-02-24 15:47:45.041074656 +0100 +@@ -583,6 +583,8 @@ source "fs/Kconfig" source "arch/cris/Kconfig.debug" @@ -256,22 +243,10 @@ diff -NurpP --minimal linux-3.7/arch/cris/Kconfig linux-3.7-vs2.3.5.1/arch/cris/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/h8300/Kconfig linux-3.7-vs2.3.5.1/arch/h8300/Kconfig ---- linux-3.7/arch/h8300/Kconfig 2012-12-11 15:46:02.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/h8300/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -217,6 +217,8 @@ source "fs/Kconfig" - - source "arch/h8300/Kconfig.debug" - -+source "kernel/vserver/Kconfig" -+ - source "security/Kconfig" - - source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/ia64/Kconfig linux-3.7-vs2.3.5.1/arch/ia64/Kconfig ---- linux-3.7/arch/ia64/Kconfig 2012-12-11 15:46:03.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/ia64/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -644,6 +644,8 @@ source "fs/Kconfig" +diff -urNp -x '*.orig' linux-4.9/arch/ia64/Kconfig linux-4.9/arch/ia64/Kconfig +--- linux-4.9/arch/ia64/Kconfig 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/arch/ia64/Kconfig 2021-02-24 15:47:45.041074656 +0100 +@@ -602,6 +602,8 @@ source "fs/Kconfig" source "arch/ia64/Kconfig.debug" @@ -280,10 +255,10 @@ diff -NurpP --minimal linux-3.7/arch/ia64/Kconfig linux-3.7-vs2.3.5.1/arch/ia64/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/ia64/kernel/entry.S linux-3.7-vs2.3.5.1/arch/ia64/kernel/entry.S ---- linux-3.7/arch/ia64/kernel/entry.S 2012-03-19 18:46:40.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/ia64/kernel/entry.S 2012-12-11 15:56:32.000000000 +0000 -@@ -1714,7 +1714,7 @@ sys_call_table: +diff -urNp -x '*.orig' linux-4.9/arch/ia64/kernel/entry.S linux-4.9/arch/ia64/kernel/entry.S +--- linux-4.9/arch/ia64/kernel/entry.S 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/arch/ia64/kernel/entry.S 2021-02-24 15:47:45.041074656 +0100 +@@ -1697,7 +1697,7 @@ sys_call_table: data8 sys_mq_notify data8 sys_mq_getsetattr data8 sys_kexec_load @@ -292,23 +267,9 @@ diff -NurpP --minimal linux-3.7/arch/ia64/kernel/entry.S linux-3.7-vs2.3.5.1/arc data8 sys_waitid // 1270 data8 sys_add_key data8 sys_request_key -diff -NurpP --minimal linux-3.7/arch/ia64/kernel/process.c linux-3.7-vs2.3.5.1/arch/ia64/kernel/process.c ---- linux-3.7/arch/ia64/kernel/process.c 2012-12-11 15:46:03.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/ia64/kernel/process.c 2012-12-11 15:56:32.000000000 +0000 -@@ -111,8 +111,8 @@ show_regs (struct pt_regs *regs) - unsigned long ip = regs->cr_iip + ia64_psr(regs)->ri; - - print_modules(); -- printk("\nPid: %d, CPU %d, comm: %20s\n", task_pid_nr(current), -- smp_processor_id(), current->comm); -+ printk("\nPid: %d[#%u], CPU %d, comm: %20s\n", task_pid_nr(current), -+ current->xid, smp_processor_id(), current->comm); - printk("psr : %016lx ifs : %016lx ip : [<%016lx>] %s (%s)\n", - regs->cr_ipsr, regs->cr_ifs, ip, print_tainted(), - init_utsname()->release); -diff -NurpP --minimal linux-3.7/arch/ia64/kernel/ptrace.c linux-3.7-vs2.3.5.1/arch/ia64/kernel/ptrace.c ---- linux-3.7/arch/ia64/kernel/ptrace.c 2012-05-21 16:06:26.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/ia64/kernel/ptrace.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/arch/ia64/kernel/ptrace.c linux-4.9/arch/ia64/kernel/ptrace.c +--- linux-4.9/arch/ia64/kernel/ptrace.c 2021-02-24 15:47:30.857297603 +0100 ++++ linux-4.9/arch/ia64/kernel/ptrace.c 2021-02-24 15:47:45.041074656 +0100 @@ -21,6 +21,7 @@ #include #include @@ -317,16 +278,16 @@ diff -NurpP --minimal linux-3.7/arch/ia64/kernel/ptrace.c linux-3.7-vs2.3.5.1/ar #include #include -diff -NurpP --minimal linux-3.7/arch/ia64/kernel/traps.c linux-3.7-vs2.3.5.1/arch/ia64/kernel/traps.c ---- linux-3.7/arch/ia64/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/ia64/kernel/traps.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/arch/ia64/kernel/traps.c linux-4.9/arch/ia64/kernel/traps.c +--- linux-4.9/arch/ia64/kernel/traps.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/arch/ia64/kernel/traps.c 2021-02-24 15:47:45.041074656 +0100 @@ -60,8 +60,9 @@ die (const char *str, struct pt_regs *re put_cpu(); if (++die.lock_owner_depth < 3) { - printk("%s[%d]: %s %ld [%d]\n", - current->comm, task_pid_nr(current), str, err, ++die_counter); -+ printk("%s[%d[#%u]]: %s %ld [%d]\n", ++ printk("%s[%d:#%u]: %s %ld [%d]\n", + current->comm, task_pid_nr(current), current->xid, + str, err, ++die_counter); if (notify_die(DIE_OOPS, str, regs, err, 255, SIGSEGV) @@ -338,31 +299,31 @@ diff -NurpP --minimal linux-3.7/arch/ia64/kernel/traps.c linux-3.7-vs2.3.5.1/arc printk(KERN_WARNING - "%s(%d): floating-point assist fault at ip %016lx, isr %016lx\n", - current->comm, task_pid_nr(current), regs->cr_iip + ia64_psr(regs)->ri, isr); -+ "%s(%d[#%u]): floating-point assist fault at ip %016lx, isr %016lx\n", ++ "%s(%d:#%u): floating-point assist fault at ip %016lx, isr %016lx\n", + current->comm, task_pid_nr(current), current->xid, + regs->cr_iip + ia64_psr(regs)->ri, isr); } } } -diff -NurpP --minimal linux-3.7/arch/m32r/kernel/traps.c linux-3.7-vs2.3.5.1/arch/m32r/kernel/traps.c ---- linux-3.7/arch/m32r/kernel/traps.c 2012-05-21 16:06:26.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/m32r/kernel/traps.c 2012-12-11 15:56:32.000000000 +0000 -@@ -195,8 +195,9 @@ static void show_registers(struct pt_reg +diff -urNp -x '*.orig' linux-4.9/arch/m32r/kernel/traps.c linux-4.9/arch/m32r/kernel/traps.c +--- linux-4.9/arch/m32r/kernel/traps.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/arch/m32r/kernel/traps.c 2021-02-24 15:47:45.041074656 +0100 +@@ -184,8 +184,9 @@ static void show_registers(struct pt_reg } else { printk("SPI: %08lx\n", sp); } - printk("Process %s (pid: %d, process nr: %d, stackpage=%08lx)", - current->comm, task_pid_nr(current), 0xffff & i, 4096+(unsigned long)current); -+ printk("Process %s (pid: %d[#%u], process nr: %d, stackpage=%08lx)", ++ printk("Process %s (pid: %d:#%u, process nr: %d, stackpage=%08lx)", + current->comm, task_pid_nr(current), current->xid, + 0xffff & i, 4096+(unsigned long)current); /* * When in-kernel, we also print out the stack and code at the -diff -NurpP --minimal linux-3.7/arch/m68k/Kconfig linux-3.7-vs2.3.5.1/arch/m68k/Kconfig ---- linux-3.7/arch/m68k/Kconfig 2012-12-11 15:46:03.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/m68k/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -135,6 +135,8 @@ source "fs/Kconfig" +diff -urNp -x '*.orig' linux-4.9/arch/m68k/Kconfig linux-4.9/arch/m68k/Kconfig +--- linux-4.9/arch/m68k/Kconfig 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/arch/m68k/Kconfig 2021-02-24 15:47:45.041074656 +0100 +@@ -163,6 +163,8 @@ source "fs/Kconfig" source "arch/m68k/Kconfig.debug" @@ -371,10 +332,10 @@ diff -NurpP --minimal linux-3.7/arch/m68k/Kconfig linux-3.7-vs2.3.5.1/arch/m68k/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/mips/Kconfig linux-3.7-vs2.3.5.1/arch/mips/Kconfig ---- linux-3.7/arch/mips/Kconfig 2012-12-11 15:46:05.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/mips/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -2574,6 +2574,8 @@ source "fs/Kconfig" +diff -urNp -x '*.orig' linux-4.9/arch/mips/Kconfig linux-4.9/arch/mips/Kconfig +--- linux-4.9/arch/mips/Kconfig 2021-02-24 15:47:30.863964478 +0100 ++++ linux-4.9/arch/mips/Kconfig 2021-02-24 15:47:45.044408094 +0100 +@@ -3194,6 +3194,8 @@ source "fs/Kconfig" source "arch/mips/Kconfig.debug" @@ -383,18 +344,18 @@ diff -NurpP --minimal linux-3.7/arch/mips/Kconfig linux-3.7-vs2.3.5.1/arch/mips/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/mips/kernel/ptrace.c linux-3.7-vs2.3.5.1/arch/mips/kernel/ptrace.c ---- linux-3.7/arch/mips/kernel/ptrace.c 2012-07-22 21:38:52.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/mips/kernel/ptrace.c 2012-12-11 15:56:32.000000000 +0000 -@@ -25,6 +25,7 @@ - #include +diff -urNp -x '*.orig' linux-4.9/arch/mips/kernel/ptrace.c linux-4.9/arch/mips/kernel/ptrace.c +--- linux-4.9/arch/mips/kernel/ptrace.c 2021-02-24 15:47:30.880631666 +0100 ++++ linux-4.9/arch/mips/kernel/ptrace.c 2021-02-24 15:47:45.044408094 +0100 +@@ -30,6 +30,7 @@ #include #include + #include +#include #include #include -@@ -262,6 +263,9 @@ long arch_ptrace(struct task_struct *chi +@@ -798,6 +799,9 @@ long arch_ptrace(struct task_struct *chi void __user *datavp = (void __user *) data; unsigned long __user *datalp = (void __user *) data; @@ -404,22 +365,22 @@ diff -NurpP --minimal linux-3.7/arch/mips/kernel/ptrace.c linux-3.7-vs2.3.5.1/ar switch (request) { /* when I and D space are separate, these will need to be fixed. */ case PTRACE_PEEKTEXT: /* read word at location addr. */ -diff -NurpP --minimal linux-3.7/arch/mips/kernel/scall32-o32.S linux-3.7-vs2.3.5.1/arch/mips/kernel/scall32-o32.S ---- linux-3.7/arch/mips/kernel/scall32-o32.S 2012-12-11 15:46:07.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/mips/kernel/scall32-o32.S 2012-12-11 15:56:32.000000000 +0000 -@@ -512,7 +512,7 @@ einval: li v0, -ENOSYS - sys sys_mq_timedreceive 5 - sys sys_mq_notify 2 /* 4275 */ - sys sys_mq_getsetattr 3 -- sys sys_ni_syscall 0 /* sys_vserver */ -+ sys sys_vserver 3 - sys sys_waitid 5 - sys sys_ni_syscall 0 /* available, was setaltroot */ - sys sys_add_key 5 /* 4280 */ -diff -NurpP --minimal linux-3.7/arch/mips/kernel/scall64-64.S linux-3.7-vs2.3.5.1/arch/mips/kernel/scall64-64.S ---- linux-3.7/arch/mips/kernel/scall64-64.S 2012-12-11 15:46:07.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/mips/kernel/scall64-64.S 2012-12-11 15:56:32.000000000 +0000 -@@ -351,7 +351,7 @@ sys_call_table: +diff -urNp -x '*.orig' linux-4.9/arch/mips/kernel/scall32-o32.S linux-4.9/arch/mips/kernel/scall32-o32.S +--- linux-4.9/arch/mips/kernel/scall32-o32.S 2021-02-24 15:47:30.880631666 +0100 ++++ linux-4.9/arch/mips/kernel/scall32-o32.S 2021-02-24 15:47:45.044408094 +0100 +@@ -511,7 +511,7 @@ EXPORT(sys_call_table) + PTR sys_mq_timedreceive + PTR sys_mq_notify /* 4275 */ + PTR sys_mq_getsetattr +- PTR sys_ni_syscall /* sys_vserver */ ++ PTR sys_vserver + PTR sys_waitid + PTR sys_ni_syscall /* available, was setaltroot */ + PTR sys_add_key /* 4280 */ +diff -urNp -x '*.orig' linux-4.9/arch/mips/kernel/scall64-64.S linux-4.9/arch/mips/kernel/scall64-64.S +--- linux-4.9/arch/mips/kernel/scall64-64.S 2021-02-24 15:47:30.880631666 +0100 ++++ linux-4.9/arch/mips/kernel/scall64-64.S 2021-02-24 15:47:45.044408094 +0100 +@@ -348,7 +348,7 @@ EXPORT(sys_call_table) PTR sys_mq_timedreceive PTR sys_mq_notify PTR sys_mq_getsetattr /* 5235 */ @@ -428,10 +389,10 @@ diff -NurpP --minimal linux-3.7/arch/mips/kernel/scall64-64.S linux-3.7-vs2.3.5. PTR sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.7/arch/mips/kernel/scall64-n32.S linux-3.7-vs2.3.5.1/arch/mips/kernel/scall64-n32.S ---- linux-3.7/arch/mips/kernel/scall64-n32.S 2012-12-11 15:46:07.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/mips/kernel/scall64-n32.S 2012-12-11 15:56:32.000000000 +0000 -@@ -350,7 +350,7 @@ EXPORT(sysn32_call_table) +diff -urNp -x '*.orig' linux-4.9/arch/mips/kernel/scall64-n32.S linux-4.9/arch/mips/kernel/scall64-n32.S +--- linux-4.9/arch/mips/kernel/scall64-n32.S 2021-02-24 15:47:30.880631666 +0100 ++++ linux-4.9/arch/mips/kernel/scall64-n32.S 2021-02-24 15:47:45.044408094 +0100 +@@ -343,7 +343,7 @@ EXPORT(sysn32_call_table) PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify PTR compat_sys_mq_getsetattr @@ -440,22 +401,22 @@ diff -NurpP --minimal linux-3.7/arch/mips/kernel/scall64-n32.S linux-3.7-vs2.3.5 PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key -diff -NurpP --minimal linux-3.7/arch/mips/kernel/scall64-o32.S linux-3.7-vs2.3.5.1/arch/mips/kernel/scall64-o32.S ---- linux-3.7/arch/mips/kernel/scall64-o32.S 2012-12-11 15:46:07.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/mips/kernel/scall64-o32.S 2012-12-11 15:56:32.000000000 +0000 -@@ -469,7 +469,7 @@ sys_call_table: +diff -urNp -x '*.orig' linux-4.9/arch/mips/kernel/scall64-o32.S linux-4.9/arch/mips/kernel/scall64-o32.S +--- linux-4.9/arch/mips/kernel/scall64-o32.S 2021-02-24 15:47:30.880631666 +0100 ++++ linux-4.9/arch/mips/kernel/scall64-o32.S 2021-02-24 15:47:45.044408094 +0100 +@@ -499,7 +499,7 @@ EXPORT(sys32_call_table) PTR compat_sys_mq_timedreceive PTR compat_sys_mq_notify /* 4275 */ PTR compat_sys_mq_getsetattr - PTR sys_ni_syscall /* sys_vserver */ + PTR sys32_vserver - PTR sys_32_waitid + PTR compat_sys_waitid PTR sys_ni_syscall /* available, was setaltroot */ PTR sys_add_key /* 4280 */ -diff -NurpP --minimal linux-3.7/arch/mips/kernel/traps.c linux-3.7-vs2.3.5.1/arch/mips/kernel/traps.c ---- linux-3.7/arch/mips/kernel/traps.c 2012-10-04 13:26:53.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/mips/kernel/traps.c 2012-12-11 15:56:32.000000000 +0000 -@@ -347,9 +347,10 @@ void show_registers(struct pt_regs *regs +diff -urNp -x '*.orig' linux-4.9/arch/mips/kernel/traps.c linux-4.9/arch/mips/kernel/traps.c +--- linux-4.9/arch/mips/kernel/traps.c 2021-02-24 15:47:30.880631666 +0100 ++++ linux-4.9/arch/mips/kernel/traps.c 2021-02-24 15:47:45.044408094 +0100 +@@ -361,9 +361,10 @@ void show_registers(struct pt_regs *regs __show_regs(regs); print_modules(); @@ -469,22 +430,22 @@ diff -NurpP --minimal linux-3.7/arch/mips/kernel/traps.c linux-3.7-vs2.3.5.1/arc if (cpu_has_userlocal) { unsigned long tls; -diff -NurpP --minimal linux-3.7/arch/parisc/Kconfig linux-3.7-vs2.3.5.1/arch/parisc/Kconfig ---- linux-3.7/arch/parisc/Kconfig 2012-12-11 15:46:08.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/parisc/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -284,6 +284,8 @@ source "fs/Kconfig" +diff -urNp -x '*.orig' linux-4.9/arch/parisc/Kconfig linux-4.9/arch/parisc/Kconfig +--- linux-4.9/arch/parisc/Kconfig 2021-02-24 15:47:30.893965417 +0100 ++++ linux-4.9/arch/parisc/Kconfig 2021-02-24 15:47:45.044408094 +0100 +@@ -348,6 +348,8 @@ config SECCOMP - source "arch/parisc/Kconfig.debug" + If unsure, say Y. Only embedded should say N here. +source "kernel/vserver/Kconfig" + source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/parisc/kernel/syscall_table.S linux-3.7-vs2.3.5.1/arch/parisc/kernel/syscall_table.S ---- linux-3.7/arch/parisc/kernel/syscall_table.S 2012-12-11 15:46:09.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/parisc/kernel/syscall_table.S 2012-12-11 15:56:32.000000000 +0000 -@@ -361,7 +361,7 @@ +diff -urNp -x '*.orig' linux-4.9/arch/parisc/kernel/syscall_table.S linux-4.9/arch/parisc/kernel/syscall_table.S +--- linux-4.9/arch/parisc/kernel/syscall_table.S 2021-02-24 15:47:30.897298854 +0100 ++++ linux-4.9/arch/parisc/kernel/syscall_table.S 2021-02-24 15:47:45.044408094 +0100 +@@ -358,7 +358,7 @@ ENTRY_COMP(mbind) /* 260 */ ENTRY_COMP(get_mempolicy) ENTRY_COMP(set_mempolicy) @@ -492,23 +453,23 @@ diff -NurpP --minimal linux-3.7/arch/parisc/kernel/syscall_table.S linux-3.7-vs2 + ENTRY_DIFF(vserver) ENTRY_SAME(add_key) ENTRY_SAME(request_key) /* 265 */ - ENTRY_SAME(keyctl) -diff -NurpP --minimal linux-3.7/arch/parisc/kernel/traps.c linux-3.7-vs2.3.5.1/arch/parisc/kernel/traps.c ---- linux-3.7/arch/parisc/kernel/traps.c 2012-05-21 16:06:28.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/parisc/kernel/traps.c 2012-12-11 15:56:32.000000000 +0000 + ENTRY_COMP(keyctl) +diff -urNp -x '*.orig' linux-4.9/arch/parisc/kernel/traps.c linux-4.9/arch/parisc/kernel/traps.c +--- linux-4.9/arch/parisc/kernel/traps.c 2021-02-24 15:47:30.897298854 +0100 ++++ linux-4.9/arch/parisc/kernel/traps.c 2021-02-24 15:47:45.044408094 +0100 @@ -235,8 +235,9 @@ void die_if_kernel(char *str, struct pt_ - if (err == 0) return; /* STFU */ -- printk(KERN_CRIT "%s (pid %d): %s (code %ld) at " RFMT "\n", + parisc_printk_ratelimited(1, regs, +- KERN_CRIT "%s (pid %d): %s (code %ld) at " RFMT "\n", - current->comm, task_pid_nr(current), str, err, regs->iaoq[0]); -+ printk(KERN_CRIT "%s (pid %d:#%u): %s (code %ld) at " RFMT "\n", ++ KERN_CRIT "%s (pid %d:#%u): %s (code %ld) at " RFMT "\n", + current->comm, task_pid_nr(current), current->xid, + str, err, regs->iaoq[0]); - #ifdef PRINT_USER_FAULTS - /* XXX for debugging only */ - show_regs(regs); -@@ -269,8 +270,8 @@ void die_if_kernel(char *str, struct pt_ + + return; + } +@@ -266,8 +267,8 @@ void die_if_kernel(char *str, struct pt_ pdc_console_restart(); if (err) @@ -519,25 +480,10 @@ diff -NurpP --minimal linux-3.7/arch/parisc/kernel/traps.c linux-3.7-vs2.3.5.1/a /* Wot's wrong wif bein' racy? */ if (current->thread.flags & PARISC_KERNEL_DEATH) { -diff -NurpP --minimal linux-3.7/arch/parisc/mm/fault.c linux-3.7-vs2.3.5.1/arch/parisc/mm/fault.c ---- linux-3.7/arch/parisc/mm/fault.c 2010-08-02 14:52:06.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/parisc/mm/fault.c 2012-12-11 15:56:32.000000000 +0000 -@@ -237,8 +237,9 @@ bad_area: - - #ifdef PRINT_USER_FAULTS - printk(KERN_DEBUG "\n"); -- printk(KERN_DEBUG "do_page_fault() pid=%d command='%s' type=%lu address=0x%08lx\n", -- task_pid_nr(tsk), tsk->comm, code, address); -+ printk(KERN_DEBUG "do_page_fault() pid=%d:#%u " -+ "command='%s' type=%lu address=0x%08lx\n", -+ task_pid_nr(tsk), tsk->xid, tsk->comm, code, address); - if (vma) { - printk(KERN_DEBUG "vm_start = 0x%08lx, vm_end = 0x%08lx\n", - vma->vm_start, vma->vm_end); -diff -NurpP --minimal linux-3.7/arch/powerpc/Kconfig linux-3.7-vs2.3.5.1/arch/powerpc/Kconfig ---- linux-3.7/arch/powerpc/Kconfig 2012-12-11 15:46:09.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/powerpc/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -1014,6 +1014,8 @@ source "lib/Kconfig" +diff -urNp -x '*.orig' linux-4.9/arch/powerpc/Kconfig linux-4.9/arch/powerpc/Kconfig +--- linux-4.9/arch/powerpc/Kconfig 2021-02-24 15:47:30.900632291 +0100 ++++ linux-4.9/arch/powerpc/Kconfig 2021-02-24 15:47:45.044408094 +0100 +@@ -1092,6 +1092,8 @@ source "lib/Kconfig" source "arch/powerpc/Kconfig.debug" @@ -545,10 +491,10 @@ diff -NurpP --minimal linux-3.7/arch/powerpc/Kconfig linux-3.7-vs2.3.5.1/arch/po + source "security/Kconfig" - config KEYS_COMPAT -diff -NurpP --minimal linux-3.7/arch/powerpc/include/uapi/asm/unistd.h linux-3.7-vs2.3.5.1/arch/powerpc/include/uapi/asm/unistd.h ---- linux-3.7/arch/powerpc/include/uapi/asm/unistd.h 2012-12-11 15:46:10.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/powerpc/include/uapi/asm/unistd.h 2012-12-11 16:48:48.000000000 +0000 + source "crypto/Kconfig" +diff -urNp -x '*.orig' linux-4.9/arch/powerpc/include/uapi/asm/unistd.h linux-4.9/arch/powerpc/include/uapi/asm/unistd.h +--- linux-4.9/arch/powerpc/include/uapi/asm/unistd.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/arch/powerpc/include/uapi/asm/unistd.h 2021-02-24 15:47:45.044408094 +0100 @@ -275,7 +275,7 @@ #endif #define __NR_rtas 255 @@ -558,40 +504,10 @@ diff -NurpP --minimal linux-3.7/arch/powerpc/include/uapi/asm/unistd.h linux-3.7 #define __NR_migrate_pages 258 #define __NR_mbind 259 #define __NR_get_mempolicy 260 -diff -NurpP --minimal linux-3.7/arch/powerpc/kernel/process.c linux-3.7-vs2.3.5.1/arch/powerpc/kernel/process.c ---- linux-3.7/arch/powerpc/kernel/process.c 2012-12-11 15:46:10.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/powerpc/kernel/process.c 2012-12-11 15:56:32.000000000 +0000 -@@ -660,8 +660,9 @@ void show_regs(struct pt_regs * regs) - #else - printk("DAR: "REG", DSISR: %08lx\n", regs->dar, regs->dsisr); - #endif -- printk("TASK = %p[%d] '%s' THREAD: %p", -- current, task_pid_nr(current), current->comm, task_thread_info(current)); -+ printk("TASK = %p[%d,#%u] '%s' THREAD: %p", -+ current, task_pid_nr(current), current->xid, -+ current->comm, task_thread_info(current)); - - #ifdef CONFIG_SMP - printk(" CPU: %d", raw_smp_processor_id()); -diff -NurpP --minimal linux-3.7/arch/powerpc/kernel/traps.c linux-3.7-vs2.3.5.1/arch/powerpc/kernel/traps.c ---- linux-3.7/arch/powerpc/kernel/traps.c 2012-12-11 15:46:10.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/powerpc/kernel/traps.c 2012-12-11 15:56:32.000000000 +0000 -@@ -1120,8 +1120,9 @@ void nonrecoverable_exception(struct pt_ - - void trace_syscall(struct pt_regs *regs) - { -- printk("Task: %p(%d), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n", -- current, task_pid_nr(current), regs->nip, regs->link, regs->gpr[0], -+ printk("Task: %p(%d[#%u]), PC: %08lX/%08lX, Syscall: %3ld, Result: %s%ld %s\n", -+ current, task_pid_nr(current), current->xid, -+ regs->nip, regs->link, regs->gpr[0], - regs->ccr&0x10000000?"Error=":"", regs->gpr[3], print_tainted()); - } - -diff -NurpP --minimal linux-3.7/arch/s390/Kconfig linux-3.7-vs2.3.5.1/arch/s390/Kconfig ---- linux-3.7/arch/s390/Kconfig 2012-12-11 15:46:14.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/s390/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -530,6 +530,8 @@ source "fs/Kconfig" +diff -urNp -x '*.orig' linux-4.9/arch/s390/Kconfig linux-4.9/arch/s390/Kconfig +--- linux-4.9/arch/s390/Kconfig 2021-02-24 15:47:30.947300418 +0100 ++++ linux-4.9/arch/s390/Kconfig 2021-02-24 15:47:45.044408094 +0100 +@@ -775,6 +775,8 @@ source "fs/Kconfig" source "arch/s390/Kconfig.debug" @@ -600,9 +516,9 @@ diff -NurpP --minimal linux-3.7/arch/s390/Kconfig linux-3.7-vs2.3.5.1/arch/s390/ source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/s390/include/asm/tlb.h linux-3.7-vs2.3.5.1/arch/s390/include/asm/tlb.h ---- linux-3.7/arch/s390/include/asm/tlb.h 2012-12-11 15:46:14.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/s390/include/asm/tlb.h 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/arch/s390/include/asm/tlb.h linux-4.9/arch/s390/include/asm/tlb.h +--- linux-4.9/arch/s390/include/asm/tlb.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/arch/s390/include/asm/tlb.h 2021-02-24 15:47:45.044408094 +0100 @@ -24,6 +24,7 @@ #include #include @@ -611,21 +527,21 @@ diff -NurpP --minimal linux-3.7/arch/s390/include/asm/tlb.h linux-3.7-vs2.3.5.1/ #include #include #include -diff -NurpP --minimal linux-3.7/arch/s390/include/uapi/asm/unistd.h linux-3.7-vs2.3.5.1/arch/s390/include/uapi/asm/unistd.h ---- linux-3.7/arch/s390/include/uapi/asm/unistd.h 2012-12-11 15:46:14.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/s390/include/uapi/asm/unistd.h 2012-12-11 16:47:45.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/arch/s390/include/uapi/asm/unistd.h linux-4.9/arch/s390/include/uapi/asm/unistd.h +--- linux-4.9/arch/s390/include/uapi/asm/unistd.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/arch/s390/include/uapi/asm/unistd.h 2021-02-24 15:47:45.044408094 +0100 @@ -200,7 +200,7 @@ - #define __NR_clock_gettime (__NR_timer_create+6) - #define __NR_clock_getres (__NR_timer_create+7) - #define __NR_clock_nanosleep (__NR_timer_create+8) + #define __NR_clock_gettime 260 + #define __NR_clock_getres 261 + #define __NR_clock_nanosleep 262 -/* Number 263 is reserved for vserver */ +#define __NR_vserver 263 #define __NR_statfs64 265 #define __NR_fstatfs64 266 #define __NR_remap_file_pages 267 -diff -NurpP --minimal linux-3.7/arch/s390/kernel/ptrace.c linux-3.7-vs2.3.5.1/arch/s390/kernel/ptrace.c ---- linux-3.7/arch/s390/kernel/ptrace.c 2012-12-11 15:46:15.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/s390/kernel/ptrace.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/arch/s390/kernel/ptrace.c linux-4.9/arch/s390/kernel/ptrace.c +--- linux-4.9/arch/s390/kernel/ptrace.c 2021-02-24 15:47:30.957300731 +0100 ++++ linux-4.9/arch/s390/kernel/ptrace.c 2021-02-24 15:47:45.047741532 +0100 @@ -21,6 +21,7 @@ #include #include @@ -634,22 +550,22 @@ diff -NurpP --minimal linux-3.7/arch/s390/kernel/ptrace.c linux-3.7-vs2.3.5.1/ar #include #include #include -diff -NurpP --minimal linux-3.7/arch/s390/kernel/syscalls.S linux-3.7-vs2.3.5.1/arch/s390/kernel/syscalls.S ---- linux-3.7/arch/s390/kernel/syscalls.S 2012-12-11 15:46:15.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/s390/kernel/syscalls.S 2012-12-11 15:56:32.000000000 +0000 -@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,sys_clock_sett - SYSCALL(sys_clock_gettime,sys_clock_gettime,sys32_clock_gettime_wrapper) /* 260 */ - SYSCALL(sys_clock_getres,sys_clock_getres,sys32_clock_getres_wrapper) - SYSCALL(sys_clock_nanosleep,sys_clock_nanosleep,sys32_clock_nanosleep_wrapper) --NI_SYSCALL /* reserved for vserver */ +diff -urNp -x '*.orig' linux-4.9/arch/s390/kernel/syscalls.S linux-4.9/arch/s390/kernel/syscalls.S +--- linux-4.9/arch/s390/kernel/syscalls.S 2021-02-24 15:47:30.960634169 +0100 ++++ linux-4.9/arch/s390/kernel/syscalls.S 2021-02-24 15:47:45.047741532 +0100 +@@ -271,7 +271,7 @@ SYSCALL(sys_clock_settime,compat_sys_clo + SYSCALL(sys_clock_gettime,compat_sys_clock_gettime) /* 260 */ + SYSCALL(sys_clock_getres,compat_sys_clock_getres) + SYSCALL(sys_clock_nanosleep,compat_sys_clock_nanosleep) +-NI_SYSCALL /* reserved for vserver */ +SYSCALL(sys_vserver,sys_vserver,sys32_vserver) - SYSCALL(sys_s390_fadvise64_64,sys_ni_syscall,sys32_fadvise64_64_wrapper) - SYSCALL(sys_statfs64,sys_statfs64,compat_sys_statfs64_wrapper) - SYSCALL(sys_fstatfs64,sys_fstatfs64,compat_sys_fstatfs64_wrapper) -diff -NurpP --minimal linux-3.7/arch/sh/Kconfig linux-3.7-vs2.3.5.1/arch/sh/Kconfig ---- linux-3.7/arch/sh/Kconfig 2012-12-11 15:46:15.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/sh/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -945,6 +945,8 @@ source "fs/Kconfig" + SYSCALL(sys_ni_syscall,compat_sys_s390_fadvise64_64) + SYSCALL(sys_statfs64,compat_sys_statfs64) + SYSCALL(sys_fstatfs64,compat_sys_fstatfs64) +diff -urNp -x '*.orig' linux-4.9/arch/sh/Kconfig linux-4.9/arch/sh/Kconfig +--- linux-4.9/arch/sh/Kconfig 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/arch/sh/Kconfig 2021-02-24 15:47:45.047741532 +0100 +@@ -904,6 +904,8 @@ source "fs/Kconfig" source "arch/sh/Kconfig.debug" @@ -658,9 +574,9 @@ diff -NurpP --minimal linux-3.7/arch/sh/Kconfig linux-3.7-vs2.3.5.1/arch/sh/Kcon source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/sh/kernel/irq.c linux-3.7-vs2.3.5.1/arch/sh/kernel/irq.c ---- linux-3.7/arch/sh/kernel/irq.c 2012-10-04 13:26:56.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/sh/kernel/irq.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/arch/sh/kernel/irq.c linux-4.9/arch/sh/kernel/irq.c +--- linux-4.9/arch/sh/kernel/irq.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/arch/sh/kernel/irq.c 2021-02-24 15:47:45.047741532 +0100 @@ -14,6 +14,7 @@ #include #include @@ -669,10 +585,10 @@ diff -NurpP --minimal linux-3.7/arch/sh/kernel/irq.c linux-3.7-vs2.3.5.1/arch/sh #include #include #include -diff -NurpP --minimal linux-3.7/arch/sparc/Kconfig linux-3.7-vs2.3.5.1/arch/sparc/Kconfig ---- linux-3.7/arch/sparc/Kconfig 2012-12-11 15:46:15.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/sparc/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -564,6 +564,8 @@ source "fs/Kconfig" +diff -urNp -x '*.orig' linux-4.9/arch/sparc/Kconfig linux-4.9/arch/sparc/Kconfig +--- linux-4.9/arch/sparc/Kconfig 2021-02-24 15:47:30.967301044 +0100 ++++ linux-4.9/arch/sparc/Kconfig 2021-02-24 15:47:45.047741532 +0100 +@@ -584,6 +584,8 @@ source "fs/Kconfig" source "arch/sparc/Kconfig.debug" @@ -681,9 +597,9 @@ diff -NurpP --minimal linux-3.7/arch/sparc/Kconfig linux-3.7-vs2.3.5.1/arch/spar source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/sparc/include/uapi/asm/unistd.h linux-3.7-vs2.3.5.1/arch/sparc/include/uapi/asm/unistd.h ---- linux-3.7/arch/sparc/include/uapi/asm/unistd.h 2012-12-11 15:46:16.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/sparc/include/uapi/asm/unistd.h 2012-12-11 16:43:01.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/arch/sparc/include/uapi/asm/unistd.h linux-4.9/arch/sparc/include/uapi/asm/unistd.h +--- linux-4.9/arch/sparc/include/uapi/asm/unistd.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/arch/sparc/include/uapi/asm/unistd.h 2021-02-24 15:47:45.047741532 +0100 @@ -332,7 +332,7 @@ #define __NR_timer_getoverrun 264 #define __NR_timer_delete 265 @@ -693,9 +609,9 @@ diff -NurpP --minimal linux-3.7/arch/sparc/include/uapi/asm/unistd.h linux-3.7-v #define __NR_io_setup 268 #define __NR_io_destroy 269 #define __NR_io_submit 270 -diff -NurpP --minimal linux-3.7/arch/sparc/kernel/systbls_32.S linux-3.7-vs2.3.5.1/arch/sparc/kernel/systbls_32.S ---- linux-3.7/arch/sparc/kernel/systbls_32.S 2012-12-11 15:46:17.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/sparc/kernel/systbls_32.S 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/arch/sparc/kernel/systbls_32.S linux-4.9/arch/sparc/kernel/systbls_32.S +--- linux-4.9/arch/sparc/kernel/systbls_32.S 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/arch/sparc/kernel/systbls_32.S 2021-02-24 15:47:45.047741532 +0100 @@ -70,7 +70,7 @@ sys_call_table: /*250*/ .long sys_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_ni_syscall /*255*/ .long sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep @@ -705,19 +621,19 @@ diff -NurpP --minimal linux-3.7/arch/sparc/kernel/systbls_32.S linux-3.7-vs2.3.5 /*270*/ .long sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink /*275*/ .long sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid /*280*/ .long sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat -diff -NurpP --minimal linux-3.7/arch/sparc/kernel/systbls_64.S linux-3.7-vs2.3.5.1/arch/sparc/kernel/systbls_64.S ---- linux-3.7/arch/sparc/kernel/systbls_64.S 2012-12-11 15:46:17.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/sparc/kernel/systbls_64.S 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/arch/sparc/kernel/systbls_64.S linux-4.9/arch/sparc/kernel/systbls_64.S +--- linux-4.9/arch/sparc/kernel/systbls_64.S 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/arch/sparc/kernel/systbls_64.S 2021-02-24 15:47:45.047741532 +0100 @@ -71,7 +71,7 @@ sys_call_table32: - /*250*/ .word sys_mremap, compat_sys_sysctl, sys32_getsid, sys_fdatasync, sys_nis_syscall + /*250*/ .word sys_mremap, compat_sys_sysctl, sys_getsid, sys_fdatasync, sys_nis_syscall .word sys32_sync_file_range, compat_sys_clock_settime, compat_sys_clock_gettime, compat_sys_clock_getres, sys32_clock_nanosleep /*260*/ .word compat_sys_sched_getaffinity, compat_sys_sched_setaffinity, sys32_timer_settime, compat_sys_timer_gettime, sys_timer_getoverrun - .word sys_timer_delete, compat_sys_timer_create, sys_ni_syscall, compat_sys_io_setup, sys_io_destroy + .word sys_timer_delete, compat_sys_timer_create, sys32_vserver, compat_sys_io_setup, sys_io_destroy /*270*/ .word sys32_io_submit, sys_io_cancel, compat_sys_io_getevents, sys32_mq_open, sys_mq_unlink .word compat_sys_mq_timedsend, compat_sys_mq_timedreceive, compat_sys_mq_notify, compat_sys_mq_getsetattr, compat_sys_waitid - /*280*/ .word sys32_tee, sys_add_key, sys_request_key, compat_sys_keyctl, compat_sys_openat -@@ -149,7 +149,7 @@ sys_call_table: + /*280*/ .word sys_tee, sys_add_key, sys_request_key, compat_sys_keyctl, compat_sys_openat +@@ -152,7 +152,7 @@ sys_call_table: /*250*/ .word sys_64_mremap, sys_sysctl, sys_getsid, sys_fdatasync, sys_nis_syscall .word sys_sync_file_range, sys_clock_settime, sys_clock_gettime, sys_clock_getres, sys_clock_nanosleep /*260*/ .word sys_sched_getaffinity, sys_sched_setaffinity, sys_timer_settime, sys_timer_gettime, sys_timer_getoverrun @@ -726,9 +642,9 @@ diff -NurpP --minimal linux-3.7/arch/sparc/kernel/systbls_64.S linux-3.7-vs2.3.5 /*270*/ .word sys_io_submit, sys_io_cancel, sys_io_getevents, sys_mq_open, sys_mq_unlink .word sys_mq_timedsend, sys_mq_timedreceive, sys_mq_notify, sys_mq_getsetattr, sys_waitid /*280*/ .word sys_tee, sys_add_key, sys_request_key, sys_keyctl, sys_openat -diff -NurpP --minimal linux-3.7/arch/um/Kconfig.rest linux-3.7-vs2.3.5.1/arch/um/Kconfig.rest ---- linux-3.7/arch/um/Kconfig.rest 2012-01-09 15:14:09.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/um/Kconfig.rest 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/arch/um/Kconfig.rest linux-4.9/arch/um/Kconfig.rest +--- linux-4.9/arch/um/Kconfig.rest 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/arch/um/Kconfig.rest 2021-02-24 15:47:45.047741532 +0100 @@ -12,6 +12,8 @@ source "arch/um/Kconfig.net" source "fs/Kconfig" @@ -738,59 +654,10 @@ diff -NurpP --minimal linux-3.7/arch/um/Kconfig.rest linux-3.7-vs2.3.5.1/arch/um source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/um/include/shared/kern_constants.h linux-3.7-vs2.3.5.1/arch/um/include/shared/kern_constants.h ---- linux-3.7/arch/um/include/shared/kern_constants.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/um/include/shared/kern_constants.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1 @@ -+#include "../../../../include/generated/asm-offsets.h" -diff -NurpP --minimal linux-3.7/arch/um/include/shared/user_constants.h linux-3.7-vs2.3.5.1/arch/um/include/shared/user_constants.h ---- linux-3.7/arch/um/include/shared/user_constants.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/um/include/shared/user_constants.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,40 @@ -+/* -+ * DO NOT MODIFY. -+ * -+ * This file was generated by arch/um/Makefile -+ * -+ */ -+ -+#define HOST_SC_CR2 176 /* offsetof(struct sigcontext, cr2) # */ -+#define HOST_SC_ERR 152 /* offsetof(struct sigcontext, err) # */ -+#define HOST_SC_TRAPNO 160 /* offsetof(struct sigcontext, trapno) # */ -+#define HOST_FP_SIZE 64 /* sizeof(struct _fpstate) / sizeof(unsigned long) # */ -+#define HOST_RBX 5 /* RBX # */ -+#define HOST_RCX 11 /* RCX # */ -+#define HOST_RDI 14 /* RDI # */ -+#define HOST_RSI 13 /* RSI # */ -+#define HOST_RDX 12 /* RDX # */ -+#define HOST_RBP 4 /* RBP # */ -+#define HOST_RAX 10 /* RAX # */ -+#define HOST_R8 9 /* R8 # */ -+#define HOST_R9 8 /* R9 # */ -+#define HOST_R10 7 /* R10 # */ -+#define HOST_R11 6 /* R11 # */ -+#define HOST_R12 3 /* R12 # */ -+#define HOST_R13 2 /* R13 # */ -+#define HOST_R14 1 /* R14 # */ -+#define HOST_R15 0 /* R15 # */ -+#define HOST_ORIG_RAX 15 /* ORIG_RAX # */ -+#define HOST_CS 17 /* CS # */ -+#define HOST_SS 20 /* SS # */ -+#define HOST_EFLAGS 18 /* EFLAGS # */ -+#define HOST_IP 16 /* RIP # */ -+#define HOST_SP 19 /* RSP # */ -+#define UM_FRAME_SIZE 216 /* sizeof(struct user_regs_struct) # */ -+#define UM_POLLIN 1 /* POLLIN # */ -+#define UM_POLLPRI 2 /* POLLPRI # */ -+#define UM_POLLOUT 4 /* POLLOUT # */ -+#define UM_PROT_READ 1 /* PROT_READ # */ -+#define UM_PROT_WRITE 2 /* PROT_WRITE # */ -+#define UM_PROT_EXEC 4 /* PROT_EXEC # */ -+ -diff -NurpP --minimal linux-3.7/arch/x86/Kconfig linux-3.7-vs2.3.5.1/arch/x86/Kconfig ---- linux-3.7/arch/x86/Kconfig 2012-12-11 15:46:18.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/x86/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -2248,6 +2248,8 @@ source "fs/Kconfig" +diff -urNp -x '*.orig' linux-4.9/arch/x86/Kconfig linux-4.9/arch/x86/Kconfig +--- linux-4.9/arch/x86/Kconfig 2021-02-24 15:47:30.980634795 +0100 ++++ linux-4.9/arch/x86/Kconfig 2021-02-24 15:47:45.047741532 +0100 +@@ -2810,6 +2810,8 @@ source "fs/Kconfig" source "arch/x86/Kconfig.debug" @@ -799,9 +666,9 @@ diff -NurpP --minimal linux-3.7/arch/x86/Kconfig linux-3.7-vs2.3.5.1/arch/x86/Kc source "security/Kconfig" source "crypto/Kconfig" -diff -NurpP --minimal linux-3.7/arch/x86/syscalls/syscall_32.tbl linux-3.7-vs2.3.5.1/arch/x86/syscalls/syscall_32.tbl ---- linux-3.7/arch/x86/syscalls/syscall_32.tbl 2012-12-11 15:46:21.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/x86/syscalls/syscall_32.tbl 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/arch/x86/entry/syscalls/syscall_32.tbl linux-4.9/arch/x86/entry/syscalls/syscall_32.tbl +--- linux-4.9/arch/x86/entry/syscalls/syscall_32.tbl 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/arch/x86/entry/syscalls/syscall_32.tbl 2021-02-24 15:47:45.047741532 +0100 @@ -279,7 +279,7 @@ 270 i386 tgkill sys_tgkill 271 i386 utimes sys_utimes compat_sys_utimes @@ -811,9 +678,9 @@ diff -NurpP --minimal linux-3.7/arch/x86/syscalls/syscall_32.tbl linux-3.7-vs2.3 274 i386 mbind sys_mbind 275 i386 get_mempolicy sys_get_mempolicy compat_sys_get_mempolicy 276 i386 set_mempolicy sys_set_mempolicy -diff -NurpP --minimal linux-3.7/arch/x86/syscalls/syscall_64.tbl linux-3.7-vs2.3.5.1/arch/x86/syscalls/syscall_64.tbl ---- linux-3.7/arch/x86/syscalls/syscall_64.tbl 2012-10-04 13:27:01.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/arch/x86/syscalls/syscall_64.tbl 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/arch/x86/entry/syscalls/syscall_64.tbl linux-4.9/arch/x86/entry/syscalls/syscall_64.tbl +--- linux-4.9/arch/x86/entry/syscalls/syscall_64.tbl 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/arch/x86/entry/syscalls/syscall_64.tbl 2021-02-24 15:47:45.047741532 +0100 @@ -242,7 +242,7 @@ 233 common epoll_ctl sys_epoll_ctl 234 common tgkill sys_tgkill @@ -823,10 +690,39 @@ diff -NurpP --minimal linux-3.7/arch/x86/syscalls/syscall_64.tbl linux-3.7-vs2.3 237 common mbind sys_mbind 238 common set_mempolicy sys_set_mempolicy 239 common get_mempolicy sys_get_mempolicy -diff -NurpP --minimal linux-3.7/drivers/block/Kconfig linux-3.7-vs2.3.5.1/drivers/block/Kconfig ---- linux-3.7/drivers/block/Kconfig 2012-12-11 15:46:23.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/block/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -291,6 +291,13 @@ config BLK_DEV_CRYPTOLOOP +diff -urNp -x '*.orig' linux-4.9/block/ioprio.c linux-4.9/block/ioprio.c +--- linux-4.9/block/ioprio.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/block/ioprio.c 2021-02-24 15:47:45.047741532 +0100 +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + int set_task_ioprio(struct task_struct *task, int ioprio) + { +@@ -105,6 +106,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which, + else + pgrp = find_vpid(who); + do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { ++ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) ++ continue; + ret = set_task_ioprio(p, ioprio); + if (ret) + break; +@@ -203,6 +206,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which, + else + pgrp = find_vpid(who); + do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { ++ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) ++ continue; + tmpio = get_task_ioprio(p); + if (tmpio < 0) + continue; +diff -urNp -x '*.orig' linux-4.9/drivers/block/Kconfig linux-4.9/drivers/block/Kconfig +--- linux-4.9/drivers/block/Kconfig 2021-02-24 15:47:31.113972298 +0100 ++++ linux-4.9/drivers/block/Kconfig 2021-02-24 15:47:45.047741532 +0100 +@@ -273,6 +273,13 @@ config BLK_DEV_CRYPTOLOOP source "drivers/block/drbd/Kconfig" @@ -840,45 +736,45 @@ diff -NurpP --minimal linux-3.7/drivers/block/Kconfig linux-3.7-vs2.3.5.1/driver config BLK_DEV_NBD tristate "Network block device support" depends on NET -diff -NurpP --minimal linux-3.7/drivers/block/Makefile linux-3.7-vs2.3.5.1/drivers/block/Makefile ---- linux-3.7/drivers/block/Makefile 2012-12-11 15:46:23.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/block/Makefile 2012-12-11 15:56:32.000000000 +0000 -@@ -34,6 +34,7 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o - obj-$(CONFIG_VIODASD) += viodasd.o +diff -urNp -x '*.orig' linux-4.9/drivers/block/Makefile linux-4.9/drivers/block/Makefile +--- linux-4.9/drivers/block/Makefile 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/drivers/block/Makefile 2021-02-24 15:47:45.051074969 +0100 +@@ -31,6 +31,7 @@ obj-$(CONFIG_VIRTIO_BLK) += virtio_blk.o + obj-$(CONFIG_BLK_DEV_SX8) += sx8.o obj-$(CONFIG_BLK_DEV_HD) += hd.o +obj-$(CONFIG_BLK_DEV_VROOT) += vroot.o obj-$(CONFIG_XEN_BLKDEV_FRONTEND) += xen-blkfront.o obj-$(CONFIG_XEN_BLKDEV_BACKEND) += xen-blkback/ -diff -NurpP --minimal linux-3.7/drivers/block/loop.c linux-3.7-vs2.3.5.1/drivers/block/loop.c ---- linux-3.7/drivers/block/loop.c 2012-12-11 15:46:24.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/block/loop.c 2012-12-11 16:49:59.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/drivers/block/loop.c linux-4.9/drivers/block/loop.c +--- linux-4.9/drivers/block/loop.c 2021-02-24 15:47:31.117305737 +0100 ++++ linux-4.9/drivers/block/loop.c 2021-02-24 15:47:45.051074969 +0100 @@ -76,6 +76,7 @@ - #include #include #include + #include +#include + #include "loop.h" #include - -@@ -869,6 +870,7 @@ static int loop_set_fd(struct loop_devic +@@ -936,6 +937,7 @@ static int loop_set_fd(struct loop_devic lo->lo_blocksize = lo_blocksize; lo->lo_device = bdev; lo->lo_flags = lo_flags; + lo->lo_xid = vx_current_xid(); lo->lo_backing_file = file; - lo->transfer = transfer_none; + lo->transfer = NULL; lo->ioctl = NULL; -@@ -1014,6 +1016,7 @@ static int loop_clr_fd(struct loop_devic +@@ -1056,6 +1058,7 @@ static int loop_clr_fd(struct loop_devic + lo->lo_offset = 0; lo->lo_sizelimit = 0; lo->lo_encrypt_key_size = 0; - lo->lo_thread = NULL; + lo->lo_xid = 0; memset(lo->lo_encrypt_key, 0, LO_KEY_SIZE); memset(lo->lo_crypt_name, 0, LO_NAME_SIZE); memset(lo->lo_file_name, 0, LO_NAME_SIZE); -@@ -1055,7 +1058,7 @@ loop_set_status(struct loop_device *lo, +@@ -1102,7 +1105,7 @@ loop_set_status(struct loop_device *lo, if (lo->lo_encrypt_key_size && !uid_eq(lo->lo_key_owner, uid) && @@ -887,7 +783,7 @@ diff -NurpP --minimal linux-3.7/drivers/block/loop.c linux-3.7-vs2.3.5.1/drivers return -EPERM; if (lo->lo_state != Lo_bound) return -ENXIO; -@@ -1145,7 +1148,8 @@ loop_get_status(struct loop_device *lo, +@@ -1207,7 +1210,8 @@ loop_get_status(struct loop_device *lo, memcpy(info->lo_crypt_name, lo->lo_crypt_name, LO_NAME_SIZE); info->lo_encrypt_type = lo->lo_encryption ? lo->lo_encryption->number : 0; @@ -897,7 +793,7 @@ diff -NurpP --minimal linux-3.7/drivers/block/loop.c linux-3.7-vs2.3.5.1/drivers info->lo_encrypt_key_size = lo->lo_encrypt_key_size; memcpy(info->lo_encrypt_key, lo->lo_encrypt_key, lo->lo_encrypt_key_size); -@@ -1505,6 +1509,11 @@ static int lo_open(struct block_device * +@@ -1569,6 +1573,11 @@ static int lo_open(struct block_device * goto out; } @@ -906,22 +802,33 @@ diff -NurpP --minimal linux-3.7/drivers/block/loop.c linux-3.7-vs2.3.5.1/drivers + goto out; + } + - mutex_lock(&lo->lo_ctl_mutex); - lo->lo_refcnt++; - mutex_unlock(&lo->lo_ctl_mutex); -diff -NurpP --minimal linux-3.7/drivers/block/vroot.c linux-3.7-vs2.3.5.1/drivers/block/vroot.c ---- linux-3.7/drivers/block/vroot.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/block/vroot.c 2012-12-11 15:56:32.000000000 +0000 + atomic_inc(&lo->lo_refcnt); + out: + mutex_unlock(&loop_index_mutex); +diff -urNp -x '*.orig' linux-4.9/drivers/block/loop.h linux-4.9/drivers/block/loop.h +--- linux-4.9/drivers/block/loop.h 2021-02-24 15:47:31.117305737 +0100 ++++ linux-4.9/drivers/block/loop.h 2021-02-24 15:47:45.051074969 +0100 +@@ -43,6 +43,7 @@ struct loop_device { + struct loop_func_table *lo_encryption; + __u32 lo_init[2]; + kuid_t lo_key_owner; /* Who set the key */ ++ vxid_t lo_xid; + int (*ioctl)(struct loop_device *, int cmd, + unsigned long arg); + +diff -urNp -x '*.orig' linux-4.9/drivers/block/vroot.c linux-4.9/drivers/block/vroot.c +--- linux-4.9/drivers/block/vroot.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/drivers/block/vroot.c 2021-02-24 15:47:45.051074969 +0100 @@ -0,0 +1,291 @@ +/* + * linux/drivers/block/vroot.c + * -+ * written by Herbert Pötzl, 9/11/2002 -+ * ported to 2.6.10 by Herbert Pötzl, 30/12/2004 ++ * written by Herbert P?tzl, 9/11/2002 ++ * ported to 2.6.10 by Herbert P?tzl, 30/12/2004 + * + * based on the loop.c code by Theodore Ts'o. + * -+ * Copyright (C) 2002-2007 by Herbert Pötzl. ++ * Copyright (C) 2002-2007 by Herbert P?tzl. + * Redistribution of this file is permitted under the + * GNU General Public License. + * @@ -964,7 +871,7 @@ diff -NurpP --minimal linux-3.7/drivers/block/vroot.c linux-3.7-vs2.3.5.1/driver + goto out; + + error = -EINVAL; -+ inode = file->f_dentry->d_inode; ++ inode = file->f_path.dentry->d_inode; + + + if (S_ISBLK(inode->i_mode)) { @@ -1043,14 +950,13 @@ diff -NurpP --minimal linux-3.7/drivers/block/vroot.c linux-3.7-vs2.3.5.1/driver + return 0; +} + -+static int vr_release(struct gendisk *disk, fmode_t mode) ++static void vr_release(struct gendisk *disk, fmode_t mode) +{ + struct vroot_device *vr = disk->private_data; + + down(&vr->vr_ctl_mutex); + --vr->vr_refcnt; + up(&vr->vr_ctl_mutex); -+ return 0; +} + +static struct block_device_operations vr_fops = { @@ -1060,10 +966,11 @@ diff -NurpP --minimal linux-3.7/drivers/block/vroot.c linux-3.7-vs2.3.5.1/driver + .ioctl = vr_ioctl, +}; + -+static void vroot_make_request(struct request_queue *q, struct bio *bio) ++static blk_qc_t vroot_make_request(struct request_queue *q, struct bio *bio) +{ + printk("vroot_make_request %p, %p\n", q, bio); + bio_io_error(bio); ++ return BLK_QC_T_NONE; +} + +struct block_device *__vroot_get_real_bdev(struct block_device *bdev) @@ -1099,7 +1006,7 @@ diff -NurpP --minimal linux-3.7/drivers/block/vroot.c linux-3.7-vs2.3.5.1/driver +MODULE_LICENSE("GPL"); +MODULE_ALIAS_BLOCKDEV_MAJOR(VROOT_MAJOR); + -+MODULE_AUTHOR ("Herbert Pötzl"); ++MODULE_AUTHOR ("Herbert P?tzl"); +MODULE_DESCRIPTION ("Virtual Root Device Mapper"); + + @@ -1204,33 +1111,20 @@ diff -NurpP --minimal linux-3.7/drivers/block/vroot.c linux-3.7-vs2.3.5.1/driver + +#endif + -diff -NurpP --minimal linux-3.7/drivers/infiniband/Kconfig linux-3.7-vs2.3.5.1/drivers/infiniband/Kconfig ---- linux-3.7/drivers/infiniband/Kconfig 2012-07-22 21:39:06.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/infiniband/Kconfig 2012-12-11 15:56:32.000000000 +0000 -@@ -39,7 +39,7 @@ config INFINIBAND_USER_MEM - config INFINIBAND_ADDR_TRANS - bool - depends on INET -- depends on !(INFINIBAND = y && IPV6 = m) -+ depends on !(INFINIBAND = y && IPV6 = y) - default y +diff -urNp -x '*.orig' linux-4.9/drivers/md/dm-core.h linux-4.9/drivers/md/dm-core.h +--- linux-4.9/drivers/md/dm-core.h 2021-02-24 15:47:31.450649498 +0100 ++++ linux-4.9/drivers/md/dm-core.h 2021-02-24 15:47:45.051074969 +0100 +@@ -52,6 +52,7 @@ struct mapped_device { - source "drivers/infiniband/hw/mthca/Kconfig" -diff -NurpP --minimal linux-3.7/drivers/infiniband/core/addr.c linux-3.7-vs2.3.5.1/drivers/infiniband/core/addr.c ---- linux-3.7/drivers/infiniband/core/addr.c 2012-12-11 15:46:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/infiniband/core/addr.c 2012-12-11 15:56:32.000000000 +0000 -@@ -261,7 +261,7 @@ static int addr6_resolve(struct sockaddr - - if (ipv6_addr_any(&fl6.saddr)) { - ret = ipv6_dev_get_saddr(&init_net, ip6_dst_idev(dst)->dev, -- &fl6.daddr, 0, &fl6.saddr); -+ &fl6.daddr, 0, &fl6.saddr, NULL); - if (ret) - goto put; - -diff -NurpP --minimal linux-3.7/drivers/md/dm-ioctl.c linux-3.7-vs2.3.5.1/drivers/md/dm-ioctl.c ---- linux-3.7/drivers/md/dm-ioctl.c 2012-10-04 13:27:11.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/md/dm-ioctl.c 2012-12-11 15:56:32.000000000 +0000 + atomic_t holders; + atomic_t open_count; ++ vxid_t xid; + + struct dm_target *immutable_target; + struct target_type *immutable_target_type; +diff -urNp -x '*.orig' linux-4.9/drivers/md/dm-ioctl.c linux-4.9/drivers/md/dm-ioctl.c +--- linux-4.9/drivers/md/dm-ioctl.c 2021-02-24 15:47:31.450649498 +0100 ++++ linux-4.9/drivers/md/dm-ioctl.c 2021-02-24 15:47:45.051074969 +0100 @@ -16,6 +16,7 @@ #include #include @@ -1239,7 +1133,7 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm-ioctl.c linux-3.7-vs2.3.5.1/driver #include -@@ -106,7 +107,8 @@ static struct hash_cell *__get_name_cell +@@ -114,7 +115,8 @@ static struct hash_cell *__get_name_cell unsigned int h = hash_str(str); list_for_each_entry (hc, _name_buckets + h, name_list) @@ -1249,7 +1143,7 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm-ioctl.c linux-3.7-vs2.3.5.1/driver dm_get(hc->md); return hc; } -@@ -120,7 +122,8 @@ static struct hash_cell *__get_uuid_cell +@@ -128,7 +130,8 @@ static struct hash_cell *__get_uuid_cell unsigned int h = hash_str(str); list_for_each_entry (hc, _uuid_buckets + h, uuid_list) @@ -1259,7 +1153,7 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm-ioctl.c linux-3.7-vs2.3.5.1/driver dm_get(hc->md); return hc; } -@@ -131,13 +134,15 @@ static struct hash_cell *__get_uuid_cell +@@ -139,13 +142,15 @@ static struct hash_cell *__get_uuid_cell static struct hash_cell *__get_dev_cell(uint64_t dev) { struct mapped_device *md; @@ -1277,17 +1171,17 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm-ioctl.c linux-3.7-vs2.3.5.1/driver if (!hc) { dm_put(md); return NULL; -@@ -445,6 +450,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl +@@ -467,6 +472,9 @@ typedef int (*ioctl_fn)(struct dm_ioctl static int remove_all(struct dm_ioctl *param, size_t param_size) { + if (!vx_check(0, VS_ADMIN)) + return -EPERM; + - dm_hash_remove_all(1); + dm_hash_remove_all(true, !!(param->flags & DM_DEFERRED_REMOVE), false); param->data_size = 0; return 0; -@@ -492,6 +500,8 @@ static int list_devices(struct dm_ioctl +@@ -514,6 +522,8 @@ static int list_devices(struct dm_ioctl */ for (i = 0; i < NUM_BUCKETS; i++) { list_for_each_entry (hc, _name_buckets + i, name_list) { @@ -1296,7 +1190,7 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm-ioctl.c linux-3.7-vs2.3.5.1/driver needed += sizeof(struct dm_name_list); needed += strlen(hc->name) + 1; needed += ALIGN_MASK; -@@ -515,6 +525,8 @@ static int list_devices(struct dm_ioctl +@@ -537,6 +547,8 @@ static int list_devices(struct dm_ioctl */ for (i = 0; i < NUM_BUCKETS; i++) { list_for_each_entry (hc, _name_buckets + i, name_list) { @@ -1305,9 +1199,9 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm-ioctl.c linux-3.7-vs2.3.5.1/driver if (old_nl) old_nl->next = (uint32_t) ((void *) nl - (void *) old_nl); -@@ -1619,8 +1631,8 @@ static int ctl_ioctl(uint command, struc - ioctl_fn fn = NULL; +@@ -1800,8 +1812,8 @@ static int ctl_ioctl(uint command, struc size_t input_param_size; + struct dm_ioctl param_kernel; - /* only root can play with this */ - if (!capable(CAP_SYS_ADMIN)) @@ -1316,26 +1210,18 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm-ioctl.c linux-3.7-vs2.3.5.1/driver return -EACCES; if (_IOC_TYPE(command) != DM_IOCTL) -diff -NurpP --minimal linux-3.7/drivers/md/dm.c linux-3.7-vs2.3.5.1/drivers/md/dm.c ---- linux-3.7/drivers/md/dm.c 2012-12-11 15:46:38.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/md/dm.c 2012-12-11 15:56:32.000000000 +0000 -@@ -19,6 +19,7 @@ - #include - #include - #include +diff -urNp -x '*.orig' linux-4.9/drivers/md/dm.c linux-4.9/drivers/md/dm.c +--- linux-4.9/drivers/md/dm.c 2021-02-24 15:47:31.457316373 +0100 ++++ linux-4.9/drivers/md/dm.c 2021-02-24 15:47:45.051074969 +0100 +@@ -22,6 +22,7 @@ + #include + #include + #include +#include - #include - -@@ -137,6 +138,7 @@ struct mapped_device { - rwlock_t map_lock; - atomic_t holders; - atomic_t open_count; -+ xid_t xid; - - unsigned long flags; + #define DM_MSG_PREFIX "core" -@@ -345,6 +347,7 @@ int dm_deleting_md(struct mapped_device +@@ -300,6 +301,7 @@ int dm_deleting_md(struct mapped_device static int dm_blk_open(struct block_device *bdev, fmode_t mode) { struct mapped_device *md; @@ -1343,7 +1229,7 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm.c linux-3.7-vs2.3.5.1/drivers/md/d spin_lock(&_minor_lock); -@@ -353,18 +356,19 @@ static int dm_blk_open(struct block_devi +@@ -308,17 +310,19 @@ static int dm_blk_open(struct block_devi goto out; if (test_bit(DMF_FREEING, &md->flags) || @@ -1359,7 +1245,6 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm.c linux-3.7-vs2.3.5.1/drivers/md/d dm_get(md); atomic_inc(&md->open_count); -- + ret = 0; out: spin_unlock(&_minor_lock); @@ -1368,15 +1253,15 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm.c linux-3.7-vs2.3.5.1/drivers/md/d + return ret; } - static int dm_blk_close(struct gendisk *disk, fmode_t mode) -@@ -575,6 +579,14 @@ int dm_set_geometry(struct mapped_device + static void dm_blk_close(struct gendisk *disk, fmode_t mode) +@@ -744,6 +748,14 @@ int dm_set_geometry(struct mapped_device return 0; } +/* + * Get the xid associated with a dm device + */ -+xid_t dm_get_xid(struct mapped_device *md) ++vxid_t dm_get_xid(struct mapped_device *md) +{ + return md->xid; +} @@ -1384,30 +1269,30 @@ diff -NurpP --minimal linux-3.7/drivers/md/dm.c linux-3.7-vs2.3.5.1/drivers/md/d /*----------------------------------------------------------------- * CRUD START: * A more elegant soln is in the works that uses the queue -@@ -1852,6 +1864,7 @@ static struct mapped_device *alloc_dev(i +@@ -1549,6 +1561,7 @@ static struct mapped_device *alloc_dev(i INIT_LIST_HEAD(&md->uevent_list); + INIT_LIST_HEAD(&md->table_devices); spin_lock_init(&md->uevent_lock); - + md->xid = vx_current_xid(); - md->queue = blk_alloc_queue(GFP_KERNEL); + + md->queue = blk_alloc_queue_node(GFP_KERNEL, numa_node_id); if (!md->queue) - goto bad_queue; -diff -NurpP --minimal linux-3.7/drivers/md/dm.h linux-3.7-vs2.3.5.1/drivers/md/dm.h ---- linux-3.7/drivers/md/dm.h 2012-10-04 13:27:11.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/md/dm.h 2012-12-11 15:56:32.000000000 +0000 -@@ -46,6 +46,8 @@ struct dm_dev_internal { +diff -urNp -x '*.orig' linux-4.9/drivers/md/dm.h linux-4.9/drivers/md/dm.h +--- linux-4.9/drivers/md/dm.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/drivers/md/dm.h 2021-02-24 15:47:45.051074969 +0100 +@@ -45,6 +45,8 @@ struct dm_dev_internal { struct dm_table; struct dm_md_mempools; -+xid_t dm_get_xid(struct mapped_device *md); ++vxid_t dm_get_xid(struct mapped_device *md); + /*----------------------------------------------------------------- * Internal table functions. *---------------------------------------------------------------*/ -diff -NurpP --minimal linux-3.7/drivers/net/tun.c linux-3.7-vs2.3.5.1/drivers/net/tun.c ---- linux-3.7/drivers/net/tun.c 2012-12-11 15:47:01.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/net/tun.c 2012-12-12 00:07:34.000000000 +0000 -@@ -64,6 +64,7 @@ +diff -urNp -x '*.orig' linux-4.9/drivers/net/tun.c linux-4.9/drivers/net/tun.c +--- linux-4.9/drivers/net/tun.c 2021-02-24 15:47:31.743992008 +0100 ++++ linux-4.9/drivers/net/tun.c 2021-02-24 15:47:45.051074969 +0100 +@@ -65,6 +65,7 @@ #include #include #include @@ -1415,15 +1300,23 @@ diff -NurpP --minimal linux-3.7/drivers/net/tun.c linux-3.7-vs2.3.5.1/drivers/ne #include #include #include -@@ -123,6 +124,7 @@ struct tun_struct { +@@ -194,6 +195,7 @@ struct tun_struct { unsigned int flags; kuid_t owner; kgid_t group; -+ nid_t nid; ++ vnid_t nid; struct net_device *dev; netdev_features_t set_features; -@@ -1034,6 +1036,7 @@ static void tun_setup(struct net_device +@@ -490,6 +492,7 @@ static inline bool tun_not_capable(struc + return ((uid_valid(tun->owner) && !uid_eq(cred->euid, tun->owner)) || + (gid_valid(tun->group) && !in_egroup_p(tun->group))) && + !ns_capable(net->user_ns, CAP_NET_ADMIN); ++ /* !cap_raised(current_cap(), CAP_NET_ADMIN) */ + } + + static void tun_set_real_num_queues(struct tun_struct *tun) +@@ -1569,6 +1572,7 @@ static void tun_setup(struct net_device tun->owner = INVALID_UID; tun->group = INVALID_GID; @@ -1431,35 +1324,16 @@ diff -NurpP --minimal linux-3.7/drivers/net/tun.c linux-3.7-vs2.3.5.1/drivers/ne dev->ethtool_ops = &tun_ethtool_ops; dev->destructor = tun_free_netdev; -@@ -1198,7 +1201,7 @@ static int tun_set_iff(struct net *net, - - if (((uid_valid(tun->owner) && !uid_eq(cred->euid, tun->owner)) || - (gid_valid(tun->group) && !in_egroup_p(tun->group))) && -- !capable(CAP_NET_ADMIN)) -+ !cap_raised(current_cap(), CAP_NET_ADMIN)) - return -EPERM; - err = security_tun_dev_attach(tun->socket.sk); - if (err < 0) -@@ -1212,7 +1215,7 @@ static int tun_set_iff(struct net *net, - char *name; - unsigned long flags = 0; +@@ -1782,7 +1786,7 @@ static int tun_set_iff(struct net *net, + int queues = ifr->ifr_flags & IFF_MULTI_QUEUE ? + MAX_TAP_QUEUES : 1; -- if (!capable(CAP_NET_ADMIN)) -+ if (!nx_capable(CAP_NET_ADMIN, NXC_TUN_CREATE)) +- if (!ns_capable(net->user_ns, CAP_NET_ADMIN)) ++ if (!nx_ns_capable(net->user_ns, CAP_NET_ADMIN, NXC_TUN_CREATE)) return -EPERM; err = security_tun_dev_create(); if (err < 0) -@@ -1283,6 +1286,9 @@ static int tun_set_iff(struct net *net, - - sk->sk_destruct = tun_sock_destruct; - -+ if (!nx_check(tun->nid, VS_IDENT | VS_HOSTID | VS_ADMIN_P)) -+ return -EPERM; -+ - err = tun_attach(tun, file); - if (err < 0) - goto failed; -@@ -1478,6 +1484,16 @@ static long __tun_chr_ioctl(struct file +@@ -2151,6 +2155,16 @@ static long __tun_chr_ioctl(struct file from_kgid(&init_user_ns, tun->group)); break; @@ -1468,7 +1342,7 @@ diff -NurpP --minimal linux-3.7/drivers/net/tun.c linux-3.7-vs2.3.5.1/drivers/ne + return -EPERM; + + /* Set nid owner of the device */ -+ tun->nid = (nid_t) arg; ++ tun->nid = (vnid_t) arg; + + tun_debug(KERN_INFO, tun, "nid owner set to %u\n", tun->nid); + break; @@ -1476,57 +1350,31 @@ diff -NurpP --minimal linux-3.7/drivers/net/tun.c linux-3.7-vs2.3.5.1/drivers/ne case TUNSETLINK: /* Only allow setting the type when the interface is down */ if (tun->dev->flags & IFF_UP) { -diff -NurpP --minimal linux-3.7/drivers/staging/csr/csr_wifi_hip_xbv.c linux-3.7-vs2.3.5.1/drivers/staging/csr/csr_wifi_hip_xbv.c ---- linux-3.7/drivers/staging/csr/csr_wifi_hip_xbv.c 2012-10-04 13:27:30.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/staging/csr/csr_wifi_hip_xbv.c 2012-12-11 15:56:32.000000000 +0000 -@@ -55,7 +55,7 @@ typedef struct - { - char t_name[4]; - u32 t_len; --} tag_t; -+} ctag_t; - - - #define TAG_EQ(i, v) (((i)[0] == (v)[0]) && \ -@@ -90,7 +90,7 @@ typedef struct - u32 ptr; - } xbv_stack_t; - --static s32 read_tag(card_t *card, ct_t *ct, tag_t *tag); -+static s32 read_tag(card_t *card, ct_t *ct, ctag_t *tag); - static s32 read_bytes(card_t *card, ct_t *ct, void *buf, u32 len); - static s32 read_uint(card_t *card, ct_t *ct, u32 *u, u32 len); - static s32 xbv_check(xbv1_t *fwinfo, const xbv_stack_t *stack, -@@ -160,7 +160,7 @@ static u32 write_fwdl_to_ptdl(void *buf, - CsrResult xbv1_parse(card_t *card, fwreadfn_t readfn, void *dlpriv, xbv1_t *fwinfo) - { - ct_t ct; -- tag_t tag; -+ ctag_t tag; - xbv_stack_t stack; - - ct.dlpriv = dlpriv; -@@ -505,7 +505,7 @@ static u32 xbv2uint(u8 *ptr, s32 len) - } - - --static s32 read_tag(card_t *card, ct_t *ct, tag_t *tag) -+static s32 read_tag(card_t *card, ct_t *ct, ctag_t *tag) - { - u8 buf[8]; - s32 n; -diff -NurpP --minimal linux-3.7/drivers/tty/sysrq.c linux-3.7-vs2.3.5.1/drivers/tty/sysrq.c ---- linux-3.7/drivers/tty/sysrq.c 2012-12-11 15:47:24.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/tty/sysrq.c 2012-12-11 16:52:41.000000000 +0000 -@@ -41,6 +41,7 @@ - #include - #include - #include +diff -urNp -x '*.orig' linux-4.9/drivers/scsi/cxgbi/libcxgbi.c linux-4.9/drivers/scsi/cxgbi/libcxgbi.c +--- linux-4.9/drivers/scsi/cxgbi/libcxgbi.c 2021-02-24 15:47:31.947331702 +0100 ++++ linux-4.9/drivers/scsi/cxgbi/libcxgbi.c 2021-02-24 15:47:45.051074969 +0100 +@@ -777,7 +777,8 @@ static struct cxgbi_sock *cxgbi_check_ro + struct inet6_dev *idev = ip6_dst_idev((struct dst_entry *)rt); + + err = ipv6_dev_get_saddr(&init_net, idev ? idev->dev : NULL, +- &daddr6->sin6_addr, 0, &pref_saddr); ++ &daddr6->sin6_addr, 0, &pref_saddr, ++ NULL); + if (err) { + pr_info("failed to get source address to reach %pI6\n", + &daddr6->sin6_addr); +diff -urNp -x '*.orig' linux-4.9/drivers/tty/sysrq.c linux-4.9/drivers/tty/sysrq.c +--- linux-4.9/drivers/tty/sysrq.c 2021-02-24 15:47:32.084002644 +0100 ++++ linux-4.9/drivers/tty/sysrq.c 2021-02-24 15:47:45.051074969 +0100 +@@ -47,6 +47,7 @@ + #include + #include + #include +#include #include #include -@@ -398,6 +399,21 @@ static struct sysrq_key_op sysrq_unrt_op +@@ -428,6 +429,21 @@ static struct sysrq_key_op sysrq_unrt_op .enable_mask = SYSRQ_ENABLE_RTNICE, }; @@ -1548,20 +1396,19 @@ diff -NurpP --minimal linux-3.7/drivers/tty/sysrq.c linux-3.7-vs2.3.5.1/drivers/ /* Key Operations table and lock */ static DEFINE_SPINLOCK(sysrq_key_table_lock); -@@ -453,7 +469,11 @@ static struct sysrq_key_op *sysrq_key_ta - &sysrq_showstate_blocked_op, /* w */ +@@ -484,7 +500,11 @@ static struct sysrq_key_op *sysrq_key_ta + /* x: May be registered on mips for TLB dump */ /* x: May be registered on ppc/powerpc for xmon */ /* x: May be registered on sparc64 for global PMU dump */ -- NULL, /* x */ +#ifdef CONFIG_VSERVER_DEBUG + &sysrq_showvxinfo_op, /* x */ +#else -+ NULL, /* x */ + NULL, /* x */ +#endif /* y: May be registered on sparc64 for global register dump */ NULL, /* y */ &sysrq_ftrace_dump_op, /* z */ -@@ -468,6 +488,8 @@ static int sysrq_key_table_key2index(int +@@ -499,6 +519,8 @@ static int sysrq_key_table_key2index(int retval = key - '0'; else if ((key >= 'a') && (key <= 'z')) retval = key + 10 - 'a'; @@ -1570,9 +1417,9 @@ diff -NurpP --minimal linux-3.7/drivers/tty/sysrq.c linux-3.7-vs2.3.5.1/drivers/ else retval = -1; return retval; -diff -NurpP --minimal linux-3.7/drivers/tty/tty_io.c linux-3.7-vs2.3.5.1/drivers/tty/tty_io.c ---- linux-3.7/drivers/tty/tty_io.c 2012-12-11 15:47:24.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/drivers/tty/tty_io.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/drivers/tty/tty_io.c linux-4.9/drivers/tty/tty_io.c +--- linux-4.9/drivers/tty/tty_io.c 2021-02-24 15:47:32.084002644 +0100 ++++ linux-4.9/drivers/tty/tty_io.c 2021-02-24 15:47:45.054408406 +0100 @@ -104,6 +104,7 @@ #include @@ -1580,8 +1427,8 @@ diff -NurpP --minimal linux-3.7/drivers/tty/tty_io.c linux-3.7-vs2.3.5.1/drivers +#include #undef TTY_DEBUG_HANGUP - -@@ -2139,7 +2140,8 @@ static int tiocsti(struct tty_struct *tt + #ifdef TTY_DEBUG_HANGUP +@@ -2321,7 +2322,8 @@ static int tiocsti(struct tty_struct *tt char ch, mbz = 0; struct tty_ldisc *ld; @@ -1591,17 +1438,17 @@ diff -NurpP --minimal linux-3.7/drivers/tty/tty_io.c linux-3.7-vs2.3.5.1/drivers return -EPERM; if (get_user(ch, p)) return -EFAULT; -@@ -2426,6 +2428,7 @@ static int tiocspgrp(struct tty_struct * - return -ENOTTY; +@@ -2634,6 +2636,7 @@ static int tiocspgrp(struct tty_struct * + if (get_user(pgrp_nr, p)) return -EFAULT; + pgrp_nr = vx_rmap_pid(pgrp_nr); if (pgrp_nr < 0) return -EINVAL; - rcu_read_lock(); -diff -NurpP --minimal linux-3.7/fs/attr.c linux-3.7-vs2.3.5.1/fs/attr.c ---- linux-3.7/fs/attr.c 2012-12-11 15:47:31.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/attr.c 2012-12-11 19:10:54.000000000 +0000 + +diff -urNp -x '*.orig' linux-4.9/fs/attr.c linux-4.9/fs/attr.c +--- linux-4.9/fs/attr.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/attr.c 2021-02-24 15:47:45.054408406 +0100 @@ -15,6 +15,9 @@ #include #include @@ -1611,9 +1458,9 @@ diff -NurpP --minimal linux-3.7/fs/attr.c linux-3.7-vs2.3.5.1/fs/attr.c +#include /** - * inode_change_ok - check if attribute changes to an inode are allowed -@@ -75,6 +78,10 @@ int inode_change_ok(const struct inode * - return -EPERM; + * setattr_prepare - check if attribute changes to a dentry are allowed +@@ -90,6 +93,10 @@ kill_priv: + return error; } + /* check for inode tag permission */ @@ -1622,8 +1469,8 @@ diff -NurpP --minimal linux-3.7/fs/attr.c linux-3.7-vs2.3.5.1/fs/attr.c + return 0; } - EXPORT_SYMBOL(inode_change_ok); -@@ -145,6 +152,8 @@ void setattr_copy(struct inode *inode, c + EXPORT_SYMBOL(setattr_prepare); +@@ -160,6 +167,8 @@ void setattr_copy(struct inode *inode, c inode->i_uid = attr->ia_uid; if (ia_valid & ATTR_GID) inode->i_gid = attr->ia_gid; @@ -1632,9 +1479,9 @@ diff -NurpP --minimal linux-3.7/fs/attr.c linux-3.7-vs2.3.5.1/fs/attr.c if (ia_valid & ATTR_ATIME) inode->i_atime = timespec_trunc(attr->ia_atime, inode->i_sb->s_time_gran); -@@ -174,7 +183,8 @@ int notify_change(struct dentry * dentry +@@ -210,7 +219,8 @@ int notify_change(struct dentry * dentry - WARN_ON_ONCE(!mutex_is_locked(&inode->i_mutex)); + WARN_ON_ONCE(!inode_is_locked(inode)); - if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID | ATTR_TIMES_SET)) { + if (ia_valid & (ATTR_MODE | ATTR_UID | ATTR_GID | @@ -1642,18 +1489,18 @@ diff -NurpP --minimal linux-3.7/fs/attr.c linux-3.7-vs2.3.5.1/fs/attr.c if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) return -EPERM; } -diff -NurpP --minimal linux-3.7/fs/block_dev.c linux-3.7-vs2.3.5.1/fs/block_dev.c ---- linux-3.7/fs/block_dev.c 2012-12-11 15:47:31.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/block_dev.c 2012-12-11 15:56:32.000000000 +0000 -@@ -27,6 +27,7 @@ - #include - #include - #include +diff -urNp -x '*.orig' linux-4.9/fs/block_dev.c linux-4.9/fs/block_dev.c +--- linux-4.9/fs/block_dev.c 2021-02-24 15:47:32.207339836 +0100 ++++ linux-4.9/fs/block_dev.c 2021-02-24 15:47:45.054408406 +0100 +@@ -31,6 +31,7 @@ + #include + #include + #include +#include #include #include "internal.h" -@@ -528,6 +529,7 @@ struct block_device *bdget(dev_t dev) +@@ -734,6 +735,7 @@ struct block_device *bdget(dev_t dev) bdev->bd_invalidated = 0; inode->i_mode = S_IFBLK; inode->i_rdev = dev; @@ -1661,7 +1508,7 @@ diff -NurpP --minimal linux-3.7/fs/block_dev.c linux-3.7-vs2.3.5.1/fs/block_dev. inode->i_bdev = bdev; inode->i_data.a_ops = &def_blk_aops; mapping_set_gfp_mask(&inode->i_data, GFP_USER); -@@ -574,6 +576,11 @@ EXPORT_SYMBOL(bdput); +@@ -780,6 +782,11 @@ EXPORT_SYMBOL(bdput); static struct block_device *bd_acquire(struct inode *inode) { struct block_device *bdev; @@ -1673,7 +1520,7 @@ diff -NurpP --minimal linux-3.7/fs/block_dev.c linux-3.7-vs2.3.5.1/fs/block_dev. spin_lock(&bdev_lock); bdev = inode->i_bdev; -@@ -584,7 +591,7 @@ static struct block_device *bd_acquire(s +@@ -790,7 +797,7 @@ static struct block_device *bd_acquire(s } spin_unlock(&bdev_lock); @@ -1682,35 +1529,19 @@ diff -NurpP --minimal linux-3.7/fs/block_dev.c linux-3.7-vs2.3.5.1/fs/block_dev. if (bdev) { spin_lock(&bdev_lock); if (!inode->i_bdev) { -diff -NurpP --minimal linux-3.7/fs/btrfs/ctree.h linux-3.7-vs2.3.5.1/fs/btrfs/ctree.h ---- linux-3.7/fs/btrfs/ctree.h 2012-12-11 15:47:31.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/btrfs/ctree.h 2012-12-11 15:56:32.000000000 +0000 -@@ -692,11 +692,14 @@ struct btrfs_inode_item { - /* modification sequence number for NFS */ - __le64 sequence; - -+ __le16 tag; - /* - * a little future expansion, for more than this we can - * just grow the inode item and version it - */ -- __le64 reserved[4]; -+ __le16 reserved16; -+ __le32 reserved32; -+ __le64 reserved[3]; - struct btrfs_timespec atime; - struct btrfs_timespec ctime; - struct btrfs_timespec mtime; -@@ -1757,6 +1760,8 @@ struct btrfs_ioctl_defrag_range_args { - #define BTRFS_MOUNT_CHECK_INTEGRITY_INCLUDING_EXTENT_DATA (1 << 21) - #define BTRFS_MOUNT_PANIC_ON_FATAL_ERROR (1 << 22) +diff -urNp -x '*.orig' linux-4.9/fs/btrfs/ctree.h linux-4.9/fs/btrfs/ctree.h +--- linux-4.9/fs/btrfs/ctree.h 2021-02-24 15:47:32.210673274 +0100 ++++ linux-4.9/fs/btrfs/ctree.h 2021-02-24 15:47:45.054408406 +0100 +@@ -1319,6 +1319,8 @@ static inline u32 BTRFS_MAX_XATTR_SIZE(c + #define BTRFS_DEFAULT_COMMIT_INTERVAL (30) + #define BTRFS_DEFAULT_MAX_INLINE (2048) +#define BTRFS_MOUNT_TAGGED (1 << 24) + #define btrfs_clear_opt(o, opt) ((o) &= ~BTRFS_MOUNT_##opt) #define btrfs_set_opt(o, opt) ((o) |= BTRFS_MOUNT_##opt) - #define btrfs_test_opt(root, opt) ((root)->fs_info->mount_opt & \ -@@ -2025,6 +2030,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st + #define btrfs_raw_test_opt(o, opt) ((o) & BTRFS_MOUNT_##opt) +@@ -1669,6 +1671,7 @@ BTRFS_SETGET_FUNCS(inode_block_group, st BTRFS_SETGET_FUNCS(inode_nlink, struct btrfs_inode_item, nlink, 32); BTRFS_SETGET_FUNCS(inode_uid, struct btrfs_inode_item, uid, 32); BTRFS_SETGET_FUNCS(inode_gid, struct btrfs_inode_item, gid, 32); @@ -1718,7 +1549,7 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/ctree.h linux-3.7-vs2.3.5.1/fs/btrfs/ct BTRFS_SETGET_FUNCS(inode_mode, struct btrfs_inode_item, mode, 32); BTRFS_SETGET_FUNCS(inode_rdev, struct btrfs_inode_item, rdev, 64); BTRFS_SETGET_FUNCS(inode_flags, struct btrfs_inode_item, flags, 64); -@@ -2078,6 +2084,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct +@@ -1716,6 +1719,10 @@ BTRFS_SETGET_FUNCS(extent_flags, struct BTRFS_SETGET_FUNCS(extent_refs_v0, struct btrfs_extent_item_v0, refs, 32); @@ -1729,100 +1560,114 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/ctree.h linux-3.7-vs2.3.5.1/fs/btrfs/ct BTRFS_SETGET_FUNCS(tree_block_level, struct btrfs_tree_block_info, level, 8); -@@ -3363,6 +3373,7 @@ extern const struct dentry_operations bt - long btrfs_ioctl(struct file *file, unsigned int cmd, unsigned long arg); +@@ -3199,6 +3206,7 @@ int btrfs_ioctl_get_supported_features(v void btrfs_update_iflags(struct inode *inode); void btrfs_inherit_iflags(struct inode *inode, struct inode *dir); + int btrfs_is_empty_uuid(u8 *uuid); +int btrfs_sync_flags(struct inode *inode, int, int); int btrfs_defrag_file(struct inode *inode, struct file *file, struct btrfs_ioctl_defrag_range_args *range, u64 newer_than, unsigned long max_pages); -diff -NurpP --minimal linux-3.7/fs/btrfs/disk-io.c linux-3.7-vs2.3.5.1/fs/btrfs/disk-io.c ---- linux-3.7/fs/btrfs/disk-io.c 2012-12-11 15:47:31.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/btrfs/disk-io.c 2012-12-11 15:56:32.000000000 +0000 -@@ -2197,6 +2197,9 @@ int open_ctree(struct super_block *sb, +diff -urNp -x '*.orig' linux-4.9/fs/btrfs/disk-io.c linux-4.9/fs/btrfs/disk-io.c +--- linux-4.9/fs/btrfs/disk-io.c 2021-02-24 15:47:32.210673274 +0100 ++++ linux-4.9/fs/btrfs/disk-io.c 2021-02-24 15:47:45.054408406 +0100 +@@ -2712,6 +2712,9 @@ int open_ctree(struct super_block *sb, goto fail_alloc; } -+ if (btrfs_test_opt(tree_root, TAGGED)) ++ if (btrfs_test_opt(fs_info, TAGGED)) + sb->s_flags |= MS_TAGGED; + features = btrfs_super_incompat_flags(disk_super) & ~BTRFS_FEATURE_INCOMPAT_SUPP; if (features) { -diff -NurpP --minimal linux-3.7/fs/btrfs/inode.c linux-3.7-vs2.3.5.1/fs/btrfs/inode.c ---- linux-3.7/fs/btrfs/inode.c 2012-12-11 15:47:31.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/btrfs/inode.c 2012-12-11 21:52:49.000000000 +0000 -@@ -39,6 +39,7 @@ - #include - #include - #include +diff -urNp -x '*.orig' linux-4.9/fs/btrfs/inode.c linux-4.9/fs/btrfs/inode.c +--- linux-4.9/fs/btrfs/inode.c 2021-02-24 15:47:32.217340149 +0100 ++++ linux-4.9/fs/btrfs/inode.c 2021-02-24 15:47:45.057741845 +0100 +@@ -43,6 +43,7 @@ + #include + #include + #include +#include - #include "compat.h" #include "ctree.h" #include "disk-io.h" -@@ -2530,6 +2531,8 @@ static void btrfs_read_locked_inode(stru - struct btrfs_key location; + #include "transaction.h" +@@ -3717,6 +3718,9 @@ static int btrfs_read_locked_inode(struc + unsigned long ptr; int maybe_acls; u32 rdev; -+ uid_t uid; -+ gid_t gid; ++ kuid_t kuid; ++ kgid_t kgid; ++ ktag_t ktag; int ret; bool filled = false; - -@@ -2557,8 +2560,13 @@ static void btrfs_read_locked_inode(stru + int first_xattr_slot; +@@ -3749,8 +3753,14 @@ static int btrfs_read_locked_inode(struc struct btrfs_inode_item); inode->i_mode = btrfs_inode_mode(leaf, inode_item); set_nlink(inode, btrfs_inode_nlink(leaf, inode_item)); - i_uid_write(inode, btrfs_inode_uid(leaf, inode_item)); - i_gid_write(inode, btrfs_inode_gid(leaf, inode_item)); + -+ uid = btrfs_inode_uid(leaf, inode_item); -+ gid = btrfs_inode_gid(leaf, inode_item); -+ i_uid_write(inode, INOTAG_UID(DX_TAG(inode), uid, gid)); -+ i_gid_write(inode, INOTAG_GID(DX_TAG(inode), uid, gid)); -+ i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), uid, gid, -+ btrfs_inode_tag(leaf, inode_item))); ++ kuid = make_kuid(&init_user_ns, btrfs_inode_uid(leaf, inode_item)); ++ kgid = make_kgid(&init_user_ns, btrfs_inode_gid(leaf, inode_item)); ++ ktag = make_ktag(&init_user_ns, btrfs_inode_tag(leaf, inode_item)); ++ ++ inode->i_uid = INOTAG_KUID(DX_TAG(inode), kuid, kgid); ++ inode->i_gid = INOTAG_KGID(DX_TAG(inode), kuid, kgid); ++ inode->i_tag = INOTAG_KTAG(DX_TAG(inode), kuid, kgid, ktag); btrfs_i_size_write(inode, btrfs_inode_size(leaf, inode_item)); - tspec = btrfs_inode_atime(inode_item); -@@ -2648,8 +2656,16 @@ static void fill_inode_item(struct btrfs - struct btrfs_inode_item *item, + inode->i_atime.tv_sec = btrfs_timespec_sec(leaf, &inode_item->atime); +@@ -3905,11 +3915,18 @@ static void fill_inode_item(struct btrfs struct inode *inode) { -- btrfs_set_inode_uid(leaf, item, i_uid_read(inode)); -- btrfs_set_inode_gid(leaf, item, i_gid_read(inode)); -+ uid_t uid = TAGINO_UID(DX_TAG(inode), -+ i_uid_read(inode), i_tag_read(inode)); -+ gid_t gid = TAGINO_GID(DX_TAG(inode), -+ i_gid_read(inode), i_tag_read(inode)); -+ -+ btrfs_set_inode_uid(leaf, item, uid); -+ btrfs_set_inode_gid(leaf, item, gid); + struct btrfs_map_token token; ++ uid_t uid = from_kuid(&init_user_ns, ++ TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag)); ++ gid_t gid = from_kgid(&init_user_ns, ++ TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag)); + + btrfs_init_map_token(&token); + +- btrfs_set_token_inode_uid(leaf, item, i_uid_read(inode), &token); +- btrfs_set_token_inode_gid(leaf, item, i_gid_read(inode), &token); ++ btrfs_set_token_inode_uid(leaf, item, uid, &token); ++ btrfs_set_token_inode_gid(leaf, item, gid, &token); +#ifdef CONFIG_TAGGING_INTERN -+ btrfs_set_inode_tag(leaf, item, i_tag_read(inode)); ++ btrfs_set_token_inode_tag(leaf, item, i_tag_read(inode), &token); +#endif - btrfs_set_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size); - btrfs_set_inode_mode(leaf, item, inode->i_mode); - btrfs_set_inode_nlink(leaf, item, inode->i_nlink); -@@ -7786,11 +7802,13 @@ static const struct inode_operations btr + btrfs_set_token_inode_size(leaf, item, BTRFS_I(inode)->disk_i_size, + &token); + btrfs_set_token_inode_mode(leaf, item, inode->i_mode, &token); +@@ -10687,6 +10704,7 @@ static const struct inode_operations btr + .mknod = btrfs_mknod, .listxattr = btrfs_listxattr, - .removexattr = btrfs_removexattr, .permission = btrfs_permission, + .sync_flags = btrfs_sync_flags, .get_acl = btrfs_get_acl, - }; + .set_acl = btrfs_set_acl, + .update_time = btrfs_update_time, +@@ -10695,6 +10713,7 @@ static const struct inode_operations btr static const struct inode_operations btrfs_dir_ro_inode_operations = { .lookup = btrfs_lookup, .permission = btrfs_permission, + .sync_flags = btrfs_sync_flags, - .get_acl = btrfs_get_acl, + .update_time = btrfs_update_time, }; -diff -NurpP --minimal linux-3.7/fs/btrfs/ioctl.c linux-3.7-vs2.3.5.1/fs/btrfs/ioctl.c ---- linux-3.7/fs/btrfs/ioctl.c 2012-12-11 15:47:31.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/btrfs/ioctl.c 2012-12-11 15:56:32.000000000 +0000 -@@ -74,10 +74,13 @@ static unsigned int btrfs_flags_to_ioctl +@@ -10760,6 +10779,7 @@ static const struct inode_operations btr + .listxattr = btrfs_listxattr, + .permission = btrfs_permission, + .fiemap = btrfs_fiemap, ++ .sync_flags = btrfs_sync_flags, + .get_acl = btrfs_get_acl, + .set_acl = btrfs_set_acl, + .update_time = btrfs_update_time, +diff -urNp -x '*.orig' linux-4.9/fs/btrfs/ioctl.c linux-4.9/fs/btrfs/ioctl.c +--- linux-4.9/fs/btrfs/ioctl.c 2021-02-24 15:47:32.217340149 +0100 ++++ linux-4.9/fs/btrfs/ioctl.c 2021-02-24 15:47:45.057741845 +0100 +@@ -110,10 +110,13 @@ static unsigned int btrfs_flags_to_ioctl { unsigned int iflags = 0; @@ -1838,9 +1683,9 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/ioctl.c linux-3.7-vs2.3.5.1/fs/btrfs/io if (flags & BTRFS_INODE_APPEND) iflags |= FS_APPEND_FL; if (flags & BTRFS_INODE_NODUMP) -@@ -94,28 +97,78 @@ static unsigned int btrfs_flags_to_ioctl - else if (flags & BTRFS_INODE_NOCOMPRESS) - iflags |= FS_NOCOMP_FL; +@@ -130,34 +133,84 @@ static unsigned int btrfs_flags_to_ioctl + else if (flags & BTRFS_INODE_COMPRESS) + iflags |= FS_COMPR_FL; + if (flags & BTRFS_INODE_BARRIER) + iflags |= FS_BARRIER_FL; @@ -1856,36 +1701,40 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/ioctl.c linux-3.7-vs2.3.5.1/fs/btrfs/io void btrfs_update_iflags(struct inode *inode) { struct btrfs_inode *ip = BTRFS_I(inode); - -- inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC); -+ inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK | -+ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC); + unsigned int new_fl = 0; - if (ip->flags & BTRFS_INODE_SYNC) -- inode->i_flags |= S_SYNC; +- new_fl |= S_SYNC; if (ip->flags & BTRFS_INODE_IMMUTABLE) - inode->i_flags |= S_IMMUTABLE; + new_fl |= S_IMMUTABLE; + if (ip->flags & BTRFS_INODE_IXUNLINK) -+ inode->i_flags |= S_IXUNLINK; ++ new_fl |= S_IXUNLINK; + + if (ip->flags & BTRFS_INODE_SYNC) -+ inode->i_flags |= S_SYNC; ++ new_fl |= S_SYNC; if (ip->flags & BTRFS_INODE_APPEND) - inode->i_flags |= S_APPEND; + new_fl |= S_APPEND; if (ip->flags & BTRFS_INODE_NOATIME) - inode->i_flags |= S_NOATIME; + new_fl |= S_NOATIME; if (ip->flags & BTRFS_INODE_DIRSYNC) - inode->i_flags |= S_DIRSYNC; -+ -+ inode->i_vflags &= ~(V_BARRIER | V_COW); + new_fl |= S_DIRSYNC; +- + set_mask_bits(&inode->i_flags, +- S_SYNC | S_APPEND | S_IMMUTABLE | S_NOATIME | S_DIRSYNC, ++ S_SYNC | S_APPEND | S_IMMUTABLE | S_IXUNLINK | S_NOATIME | S_DIRSYNC, + new_fl); + ++ new_fl = 0; + if (ip->flags & BTRFS_INODE_BARRIER) -+ inode->i_vflags |= V_BARRIER; ++ new_fl |= V_BARRIER; + if (ip->flags & BTRFS_INODE_COW) -+ inode->i_vflags |= V_COW; -+} ++ new_fl |= V_COW; + -+/* ++ set_mask_bits(&inode->i_vflags, ++ V_BARRIER | V_COW, new_fl); + } + + /* + * Update btrfs internal flags from inode->i_(v)flags. + */ +void btrfs_update_flags(struct inode *inode) @@ -1918,10 +1767,13 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/ioctl.c linux-3.7-vs2.3.5.1/fs/btrfs/io + ip->flags |= BTRFS_INODE_BARRIER; + if (vflags & V_COW) + ip->flags |= BTRFS_INODE_COW; - } - - /* -@@ -131,6 +184,7 @@ void btrfs_inherit_iflags(struct inode * ++ } ++ ++/* + * Inherit flags from the parent inode. + * + * Currently only the compression flags and the cow flags are inherited. +@@ -170,6 +223,7 @@ void btrfs_inherit_iflags(struct inode * return; flags = BTRFS_I(dir)->flags; @@ -1929,7 +1781,7 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/ioctl.c linux-3.7-vs2.3.5.1/fs/btrfs/io if (flags & BTRFS_INODE_NOCOMPRESS) { BTRFS_I(inode)->flags &= ~BTRFS_INODE_COMPRESS; -@@ -146,6 +200,30 @@ void btrfs_inherit_iflags(struct inode * +@@ -188,6 +242,30 @@ void btrfs_inherit_iflags(struct inode * btrfs_update_iflags(inode); } @@ -1959,8 +1811,8 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/ioctl.c linux-3.7-vs2.3.5.1/fs/btrfs/io + static int btrfs_ioctl_getflags(struct file *file, void __user *arg) { - struct btrfs_inode *ip = BTRFS_I(file->f_path.dentry->d_inode); -@@ -208,21 +286,27 @@ static int btrfs_ioctl_setflags(struct f + struct btrfs_inode *ip = BTRFS_I(file_inode(file)); +@@ -250,21 +328,27 @@ static int btrfs_ioctl_setflags(struct f flags = btrfs_mask_flags(inode->i_mode, flags); oldflags = btrfs_flags_to_ioctl(ip->flags); @@ -1993,32 +1845,32 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/ioctl.c linux-3.7-vs2.3.5.1/fs/btrfs/io if (flags & FS_APPEND_FL) ip->flags |= BTRFS_INODE_APPEND; else -diff -NurpP --minimal linux-3.7/fs/btrfs/super.c linux-3.7-vs2.3.5.1/fs/btrfs/super.c ---- linux-3.7/fs/btrfs/super.c 2012-12-11 15:47:31.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/btrfs/super.c 2012-12-11 15:56:32.000000000 +0000 -@@ -312,7 +312,7 @@ enum { - Opt_no_space_cache, Opt_recovery, Opt_skip_balance, - Opt_check_integrity, Opt_check_integrity_including_extent_data, - Opt_check_integrity_print_mask, Opt_fatal_errors, +diff -urNp -x '*.orig' linux-4.9/fs/btrfs/super.c linux-4.9/fs/btrfs/super.c +--- linux-4.9/fs/btrfs/super.c 2021-02-24 15:47:32.224007024 +0100 ++++ linux-4.9/fs/btrfs/super.c 2021-02-24 15:47:45.057741845 +0100 +@@ -327,7 +327,7 @@ enum { + #ifdef CONFIG_BTRFS_DEBUG + Opt_fragment_data, Opt_fragment_metadata, Opt_fragment_all, + #endif - Opt_err, + Opt_tag, Opt_notag, Opt_tagid, Opt_err, }; - static match_table_t tokens = { -@@ -352,6 +352,9 @@ static match_table_t tokens = { - {Opt_check_integrity_including_extent_data, "check_int_data"}, - {Opt_check_integrity_print_mask, "check_int_print_mask=%d"}, - {Opt_fatal_errors, "fatal_errors=%s"}, + static const match_table_t tokens = { +@@ -388,6 +388,9 @@ static const match_table_t tokens = { + {Opt_fragment_metadata, "fragment=metadata"}, + {Opt_fragment_all, "fragment=all"}, + #endif + {Opt_tag, "tag"}, + {Opt_notag, "notag"}, + {Opt_tagid, "tagid=%u"}, {Opt_err, NULL}, }; -@@ -614,6 +617,22 @@ int btrfs_parse_options(struct btrfs_roo - goto out; - } +@@ -833,6 +836,22 @@ int btrfs_parse_options(struct btrfs_roo + btrfs_set_opt(info->mount_opt, FRAGMENT_DATA); break; + #endif +#ifndef CONFIG_TAGGING_NONE + case Opt_tag: + printk(KERN_INFO "btrfs: use tagging\n"); @@ -2036,24 +1888,24 @@ diff -NurpP --minimal linux-3.7/fs/btrfs/super.c linux-3.7-vs2.3.5.1/fs/btrfs/su + break; +#endif case Opt_err: - printk(KERN_INFO "btrfs: unrecognized mount option " - "'%s'\n", p); -@@ -1211,6 +1230,12 @@ static int btrfs_remount(struct super_bl + btrfs_info(root->fs_info, + "unrecognized mount option '%s'", p); +@@ -1760,6 +1779,12 @@ static int btrfs_remount(struct super_bl btrfs_resize_thread_pool(fs_info, fs_info->thread_pool_size, old_thread_pool_size); -+ if (btrfs_test_opt(root, TAGGED) && !(sb->s_flags & MS_TAGGED)) { ++ if (btrfs_test_opt(fs_info, TAGGED) && !(sb->s_flags & MS_TAGGED)) { + printk("btrfs: %s: tagging not permitted on remount.\n", + sb->s_id); + return -EINVAL; + } + if ((*flags & MS_RDONLY) == (sb->s_flags & MS_RDONLY)) - return 0; + goto out; -diff -NurpP --minimal linux-3.7/fs/char_dev.c linux-3.7-vs2.3.5.1/fs/char_dev.c ---- linux-3.7/fs/char_dev.c 2012-12-11 15:47:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/char_dev.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/char_dev.c linux-4.9/fs/char_dev.c +--- linux-4.9/fs/char_dev.c 2021-02-24 15:47:32.230673899 +0100 ++++ linux-4.9/fs/char_dev.c 2021-02-24 15:47:45.057741845 +0100 @@ -21,6 +21,8 @@ #include #include @@ -2063,7 +1915,7 @@ diff -NurpP --minimal linux-3.7/fs/char_dev.c linux-3.7-vs2.3.5.1/fs/char_dev.c #include "internal.h" -@@ -371,14 +373,21 @@ static int chrdev_open(struct inode *ino +@@ -360,14 +362,21 @@ static int chrdev_open(struct inode *ino struct cdev *p; struct cdev *new = NULL; int ret = 0; @@ -2086,37 +1938,69 @@ diff -NurpP --minimal linux-3.7/fs/char_dev.c linux-3.7-vs2.3.5.1/fs/char_dev.c if (!kobj) return -ENXIO; new = container_of(kobj, struct cdev, kobj); -diff -NurpP --minimal linux-3.7/fs/dcache.c linux-3.7-vs2.3.5.1/fs/dcache.c ---- linux-3.7/fs/dcache.c 2012-12-11 15:47:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/dcache.c 2012-12-11 15:56:32.000000000 +0000 -@@ -37,6 +37,7 @@ - #include - #include +diff -urNp -x '*.orig' linux-4.9/fs/dcache.c linux-4.9/fs/dcache.c +--- linux-4.9/fs/dcache.c 2021-02-24 15:47:32.247341088 +0100 ++++ linux-4.9/fs/dcache.c 2021-02-24 15:47:45.061075282 +0100 +@@ -39,6 +39,7 @@ #include + #include + #include +#include + #include "internal.h" #include "mount.h" - -@@ -617,6 +618,8 @@ int d_invalidate(struct dentry * dentry) +@@ -690,6 +691,7 @@ static inline bool fast_dput(struct dent spin_lock(&dentry->d_lock); - } + if (dentry->d_lockref.count > 1) { + dentry->d_lockref.count--; ++ vx_dentry_dec(dentry); + spin_unlock(&dentry->d_lock); + return 1; + } +@@ -821,6 +823,7 @@ repeat: + dentry_lru_add(dentry); + dentry->d_lockref.count--; + vx_dentry_dec(dentry); -+ - /* - * Somebody else still using it? - * -@@ -646,6 +649,7 @@ EXPORT_SYMBOL(d_invalidate); + spin_unlock(&dentry->d_lock); + return; + +@@ -838,6 +841,7 @@ EXPORT_SYMBOL(dput); static inline void __dget_dlock(struct dentry *dentry) { - dentry->d_count++; + dentry->d_lockref.count++; + vx_dentry_inc(dentry); } static inline void __dget(struct dentry *dentry) -@@ -1276,6 +1280,9 @@ struct dentry *__d_alloc(struct super_bl - struct dentry *dentry; +@@ -850,6 +854,8 @@ struct dentry *dget_parent(struct dentry + int gotref; + struct dentry *ret; + ++ vx_dentry_dec(dentry); ++ + /* + * Do optimistic parent lookup without any + * locking. +@@ -880,6 +886,7 @@ repeat: + rcu_read_unlock(); + BUG_ON(!ret->d_lockref.count); + ret->d_lockref.count++; ++ vx_dentry_inc(ret); + spin_unlock(&ret->d_lock); + return ret; + } +@@ -1034,6 +1041,7 @@ static void shrink_dentry_list(struct li + parent = lock_parent(dentry); + if (dentry->d_lockref.count != 1) { + dentry->d_lockref.count--; ++ vx_dentry_dec(dentry); + spin_unlock(&dentry->d_lock); + if (parent) + spin_unlock(&parent->d_lock); +@@ -1594,6 +1602,9 @@ struct dentry *__d_alloc(struct super_bl char *dname; + int err; + if (!vx_dentry_avail(1)) + return NULL; @@ -2124,26 +2008,34 @@ diff -NurpP --minimal linux-3.7/fs/dcache.c linux-3.7-vs2.3.5.1/fs/dcache.c dentry = kmem_cache_alloc(dentry_cache, GFP_KERNEL); if (!dentry) return NULL; -@@ -1308,6 +1315,7 @@ struct dentry *__d_alloc(struct super_bl +@@ -1637,6 +1648,7 @@ struct dentry *__d_alloc(struct super_bl - dentry->d_count = 1; + dentry->d_lockref.count = 1; dentry->d_flags = 0; + vx_dentry_inc(dentry); spin_lock_init(&dentry->d_lock); seqcount_init(&dentry->d_seq); dentry->d_inode = NULL; -@@ -2012,6 +2020,7 @@ struct dentry *__d_lookup(struct dentry - } +@@ -2310,6 +2322,7 @@ struct dentry *__d_lookup(const struct d + goto next; - dentry->d_count++; + dentry->d_lockref.count++; + vx_dentry_inc(dentry); found = dentry; spin_unlock(&dentry->d_lock); break; -diff -NurpP --minimal linux-3.7/fs/devpts/inode.c linux-3.7-vs2.3.5.1/fs/devpts/inode.c ---- linux-3.7/fs/devpts/inode.c 2012-10-04 13:27:39.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/devpts/inode.c 2012-12-11 19:18:53.000000000 +0000 -@@ -25,6 +25,7 @@ +@@ -3568,6 +3581,7 @@ static enum d_walk_ret d_genocide_kill(v + if (!(dentry->d_flags & DCACHE_GENOCIDE)) { + dentry->d_flags |= DCACHE_GENOCIDE; + dentry->d_lockref.count--; ++ vx_dentry_dec(dentry); + } + } + return D_WALK_CONTINUE; +diff -urNp -x '*.orig' linux-4.9/fs/devpts/inode.c linux-4.9/fs/devpts/inode.c +--- linux-4.9/fs/devpts/inode.c 2021-02-24 15:47:32.247341088 +0100 ++++ linux-4.9/fs/devpts/inode.c 2021-02-24 15:47:45.061075282 +0100 +@@ -27,6 +27,7 @@ #include #include #include @@ -2151,7 +2043,7 @@ diff -NurpP --minimal linux-3.7/fs/devpts/inode.c linux-3.7-vs2.3.5.1/fs/devpts/ #define DEVPTS_DEFAULT_MODE 0600 /* -@@ -36,6 +37,21 @@ +@@ -38,6 +39,21 @@ #define DEVPTS_DEFAULT_PTMX_MODE 0000 #define PTMX_MINOR 2 @@ -2160,7 +2052,7 @@ diff -NurpP --minimal linux-3.7/fs/devpts/inode.c linux-3.7-vs2.3.5.1/fs/devpts/ + int ret = -EACCES; + + /* devpts is xid tagged */ -+ if (vx_check((xid_t)i_tag_read(inode), VS_WATCH_P | VS_IDENT)) ++ if (vx_check((vxid_t)i_tag_read(inode), VS_WATCH_P | VS_IDENT)) + ret = generic_permission(inode, mask); + return ret; +} @@ -2173,17 +2065,17 @@ diff -NurpP --minimal linux-3.7/fs/devpts/inode.c linux-3.7-vs2.3.5.1/fs/devpts/ /* * sysctl support for setting limits on the number of Unix98 ptys allocated. * Otherwise one can eat up all kernel memory by opening /dev/ptmx repeatedly. -@@ -336,6 +352,34 @@ static int devpts_show_options(struct se +@@ -363,6 +379,34 @@ static int devpts_show_options(struct se return 0; } +static int devpts_filter(struct dentry *de) +{ -+ xid_t xid = 0; ++ vxid_t xid = 0; + + /* devpts is xid tagged */ + if (de && de->d_inode) -+ xid = (xid_t)i_tag_read(de->d_inode); ++ xid = (vxid_t)i_tag_read(de->d_inode); +#ifdef CONFIG_VSERVER_WARN_DEVPTS + else + vxwprintk_task(1, "devpts " VS_Q("%.*s") " without inode.", @@ -2192,9 +2084,9 @@ diff -NurpP --minimal linux-3.7/fs/devpts/inode.c linux-3.7-vs2.3.5.1/fs/devpts/ + return vx_check(xid, VS_WATCH_P | VS_IDENT); +} + -+static int devpts_readdir(struct file * filp, void * dirent, filldir_t filldir) ++static int devpts_readdir(struct file * filp, struct dir_context *ctx) +{ -+ return dcache_readdir_filter(filp, dirent, filldir, devpts_filter); ++ return dcache_readdir_filter(filp, ctx, devpts_filter); +} + +static struct file_operations devpts_dir_operations = { @@ -2202,38 +2094,38 @@ diff -NurpP --minimal linux-3.7/fs/devpts/inode.c linux-3.7-vs2.3.5.1/fs/devpts/ + .release = dcache_dir_close, + .llseek = dcache_dir_lseek, + .read = generic_read_dir, -+ .readdir = devpts_readdir, ++ .iterate = devpts_readdir, +}; + static const struct super_operations devpts_sops = { .statfs = simple_statfs, .remount_fs = devpts_remount, -@@ -379,8 +423,10 @@ devpts_fill_super(struct super_block *s, - inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; +@@ -416,8 +460,10 @@ devpts_fill_super(struct super_block *s, + inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode); inode->i_mode = S_IFDIR | S_IRUGO | S_IXUGO | S_IWUSR; inode->i_op = &simple_dir_inode_operations; - inode->i_fop = &simple_dir_operations; + inode->i_fop = &devpts_dir_operations; set_nlink(inode, 2); + /* devpts is xid tagged */ -+ i_tag_write(inode, (tag_t)vx_current_xid()); ++ i_tag_write(inode, (vtag_t)vx_current_xid()); s->s_root = d_make_root(inode); - if (s->s_root) -@@ -572,6 +618,9 @@ int devpts_pty_new(struct inode *ptmx_in + if (!s->s_root) { +@@ -543,6 +589,9 @@ struct dentry *devpts_pty_new(struct pts inode->i_gid = opts->setgid ? opts->gid : current_fsgid(); - inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; - init_special_inode(inode, S_IFCHR|opts->mode, device); + inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode); + init_special_inode(inode, S_IFCHR|opts->mode, MKDEV(UNIX98_PTY_SLAVE_MAJOR, index)); + /* devpts is xid tagged */ -+ i_tag_write(inode, (tag_t)vx_current_xid()); ++ i_tag_write(inode, (vtag_t)vx_current_xid()); + inode->i_op = &devpts_file_inode_operations; - inode->i_private = tty; - tty->driver_data = inode; -diff -NurpP --minimal linux-3.7/fs/ext2/balloc.c linux-3.7-vs2.3.5.1/fs/ext2/balloc.c ---- linux-3.7/fs/ext2/balloc.c 2012-12-11 15:47:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext2/balloc.c 2012-12-11 15:56:32.000000000 +0000 -@@ -699,7 +699,6 @@ ext2_try_to_allocate(struct super_block + sprintf(s, "%d", index); + +diff -urNp -x '*.orig' linux-4.9/fs/ext2/balloc.c linux-4.9/fs/ext2/balloc.c +--- linux-4.9/fs/ext2/balloc.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/ext2/balloc.c 2021-02-24 15:47:45.061075282 +0100 +@@ -693,7 +693,6 @@ ext2_try_to_allocate(struct super_block start = 0; end = EXT2_BLOCKS_PER_GROUP(sb); } @@ -2241,10 +2133,10 @@ diff -NurpP --minimal linux-3.7/fs/ext2/balloc.c linux-3.7-vs2.3.5.1/fs/ext2/bal BUG_ON(start > EXT2_BLOCKS_PER_GROUP(sb)); repeat: -diff -NurpP --minimal linux-3.7/fs/ext2/ext2.h linux-3.7-vs2.3.5.1/fs/ext2/ext2.h ---- linux-3.7/fs/ext2/ext2.h 2012-07-22 21:39:39.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext2/ext2.h 2012-12-11 15:56:32.000000000 +0000 -@@ -244,8 +244,12 @@ struct ext2_group_desc +diff -urNp -x '*.orig' linux-4.9/fs/ext2/ext2.h linux-4.9/fs/ext2/ext2.h +--- linux-4.9/fs/ext2/ext2.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/ext2/ext2.h 2021-02-24 15:47:45.061075282 +0100 +@@ -247,8 +247,12 @@ struct ext2_group_desc #define EXT2_NOTAIL_FL FS_NOTAIL_FL /* file tail should not be merged */ #define EXT2_DIRSYNC_FL FS_DIRSYNC_FL /* dirsync behaviour (directories only) */ #define EXT2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/ @@ -2257,7 +2149,7 @@ diff -NurpP --minimal linux-3.7/fs/ext2/ext2.h linux-3.7-vs2.3.5.1/fs/ext2/ext2. #define EXT2_FL_USER_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */ #define EXT2_FL_USER_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */ -@@ -329,7 +333,8 @@ struct ext2_inode { +@@ -332,7 +336,8 @@ struct ext2_inode { __u16 i_pad1; __le16 l_i_uid_high; /* these 2 fields */ __le16 l_i_gid_high; /* were reserved2[0] */ @@ -2267,7 +2159,7 @@ diff -NurpP --minimal linux-3.7/fs/ext2/ext2.h linux-3.7-vs2.3.5.1/fs/ext2/ext2. } linux2; struct { __u8 h_i_frag; /* Fragment number */ -@@ -357,6 +362,7 @@ struct ext2_inode { +@@ -360,6 +365,7 @@ struct ext2_inode { #define i_gid_low i_gid #define i_uid_high osd2.linux2.l_i_uid_high #define i_gid_high osd2.linux2.l_i_gid_high @@ -2275,15 +2167,15 @@ diff -NurpP --minimal linux-3.7/fs/ext2/ext2.h linux-3.7-vs2.3.5.1/fs/ext2/ext2. #define i_reserved2 osd2.linux2.l_i_reserved2 /* -@@ -384,6 +390,7 @@ struct ext2_inode { - #define EXT2_MOUNT_USRQUOTA 0x020000 /* user quota */ - #define EXT2_MOUNT_GRPQUOTA 0x040000 /* group quota */ - #define EXT2_MOUNT_RESERVATION 0x080000 /* Preallocation */ -+#define EXT2_MOUNT_TAGGED (1<<24) /* Enable Context Tags */ +@@ -393,6 +399,7 @@ struct ext2_inode { + #else + #define EXT2_MOUNT_DAX 0 + #endif ++#define EXT2_MOUNT_TAGGED 0x200000 /* Enable Context Tags */ #define clear_opt(o, opt) o &= ~EXT2_MOUNT_##opt -@@ -757,6 +764,7 @@ extern void ext2_set_inode_flags(struct +@@ -782,6 +789,7 @@ extern void ext2_set_inode_flags(struct extern void ext2_get_inode_flags(struct ext2_inode_info *); extern int ext2_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, u64 start, u64 len); @@ -2291,18 +2183,18 @@ diff -NurpP --minimal linux-3.7/fs/ext2/ext2.h linux-3.7-vs2.3.5.1/fs/ext2/ext2. /* ioctl.c */ extern long ext2_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.7/fs/ext2/file.c linux-3.7-vs2.3.5.1/fs/ext2/file.c ---- linux-3.7/fs/ext2/file.c 2011-10-24 16:45:27.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext2/file.c 2012-12-11 15:56:32.000000000 +0000 -@@ -104,4 +104,5 @@ const struct inode_operations ext2_file_ - .setattr = ext2_setattr, +diff -urNp -x '*.orig' linux-4.9/fs/ext2/file.c linux-4.9/fs/ext2/file.c +--- linux-4.9/fs/ext2/file.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/ext2/file.c 2021-02-24 15:47:45.061075282 +0100 +@@ -247,4 +247,5 @@ const struct inode_operations ext2_file_ .get_acl = ext2_get_acl, + .set_acl = ext2_set_acl, .fiemap = ext2_fiemap, + .sync_flags = ext2_sync_flags, }; -diff -NurpP --minimal linux-3.7/fs/ext2/ialloc.c linux-3.7-vs2.3.5.1/fs/ext2/ialloc.c ---- linux-3.7/fs/ext2/ialloc.c 2012-10-04 13:27:39.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext2/ialloc.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/ext2/ialloc.c linux-4.9/fs/ext2/ialloc.c +--- linux-4.9/fs/ext2/ialloc.c 2021-02-24 15:47:32.254007963 +0100 ++++ linux-4.9/fs/ext2/ialloc.c 2021-02-24 15:47:45.061075282 +0100 @@ -17,6 +17,7 @@ #include #include @@ -2311,48 +2203,38 @@ diff -NurpP --minimal linux-3.7/fs/ext2/ialloc.c linux-3.7-vs2.3.5.1/fs/ext2/ial #include "ext2.h" #include "xattr.h" #include "acl.h" -@@ -547,6 +548,7 @@ got: +@@ -552,6 +553,7 @@ got: inode->i_mode = mode; inode->i_uid = current_fsuid(); inode->i_gid = dir->i_gid; -+ inode->i_tag = dx_current_fstag(sb); ++ i_tag_write(inode, dx_current_fstag(sb)); } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.7/fs/ext2/inode.c linux-3.7-vs2.3.5.1/fs/ext2/inode.c ---- linux-3.7/fs/ext2/inode.c 2012-10-04 13:27:39.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext2/inode.c 2012-12-11 19:22:08.000000000 +0000 -@@ -31,6 +31,7 @@ - #include - #include +diff -urNp -x '*.orig' linux-4.9/fs/ext2/inode.c linux-4.9/fs/ext2/inode.c +--- linux-4.9/fs/ext2/inode.c 2021-02-24 15:47:32.254007963 +0100 ++++ linux-4.9/fs/ext2/inode.c 2021-02-24 15:47:45.061075282 +0100 +@@ -35,6 +35,7 @@ + #include #include + #include +#include #include "ext2.h" #include "acl.h" - #include "xip.h" -@@ -1165,7 +1166,7 @@ static void ext2_truncate_blocks(struct - return; - if (ext2_inode_is_fast_symlink(inode)) - return; -- if (IS_APPEND(inode) || IS_IMMUTABLE(inode)) -+ if (IS_APPEND(inode) || IS_IXORUNLINK(inode)) - return; - __ext2_truncate_blocks(inode, offset); - } -@@ -1256,36 +1257,61 @@ void ext2_set_inode_flags(struct inode * + #include "xattr.h" +@@ -1360,39 +1361,61 @@ void ext2_set_inode_flags(struct inode * { unsigned int flags = EXT2_I(inode)->i_flags; -- inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC); -+ inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK | +- inode->i_flags &= ~(S_SYNC | S_APPEND | S_IMMUTABLE | S_NOATIME | +- S_DIRSYNC | S_DAX); ++ inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK | S_DAX | + S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC); + -+ + if (flags & EXT2_IMMUTABLE_FL) + inode->i_flags |= S_IMMUTABLE; + if (flags & EXT2_IXUNLINK_FL) + inode->i_flags |= S_IXUNLINK; -+ if (flags & EXT2_SYNC_FL) inode->i_flags |= S_SYNC; if (flags & EXT2_APPEND_FL) @@ -2363,6 +2245,8 @@ diff -NurpP --minimal linux-3.7/fs/ext2/inode.c linux-3.7-vs2.3.5.1/fs/ext2/inod inode->i_flags |= S_NOATIME; if (flags & EXT2_DIRSYNC_FL) inode->i_flags |= S_DIRSYNC; + if (test_opt(inode->i_sb, DAX) && S_ISREG(inode->i_mode)) + inode->i_flags |= S_DAX; + + inode->i_vflags &= ~(V_BARRIER | V_COW); + @@ -2408,7 +2292,7 @@ diff -NurpP --minimal linux-3.7/fs/ext2/inode.c linux-3.7-vs2.3.5.1/fs/ext2/inod } struct inode *ext2_iget (struct super_block *sb, unsigned long ino) -@@ -1321,8 +1347,10 @@ struct inode *ext2_iget (struct super_bl +@@ -1428,8 +1451,10 @@ struct inode *ext2_iget (struct super_bl i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16; i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16; } @@ -2421,20 +2305,20 @@ diff -NurpP --minimal linux-3.7/fs/ext2/inode.c linux-3.7-vs2.3.5.1/fs/ext2/inod set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); inode->i_size = le32_to_cpu(raw_inode->i_size); inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime); -@@ -1420,8 +1448,10 @@ static int __ext2_write_inode(struct ino +@@ -1536,8 +1561,10 @@ static int __ext2_write_inode(struct ino struct ext2_inode_info *ei = EXT2_I(inode); struct super_block *sb = inode->i_sb; ino_t ino = inode->i_ino; - uid_t uid = i_uid_read(inode); - gid_t gid = i_gid_read(inode); -+ uid_t uid = TAGINO_UID(DX_TAG(inode), -+ i_uid_read(inode), i_tag_read(inode)); -+ gid_t gid = TAGINO_GID(DX_TAG(inode), -+ i_gid_read(inode), i_tag_read(inode)); ++ uid_t uid = from_kuid(&init_user_ns, ++ TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag)); ++ gid_t gid = from_kgid(&init_user_ns, ++ TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag)); struct buffer_head * bh; struct ext2_inode * raw_inode = ext2_get_inode(sb, ino, &bh); int n; -@@ -1457,6 +1487,9 @@ static int __ext2_write_inode(struct ino +@@ -1573,6 +1600,9 @@ static int __ext2_write_inode(struct ino raw_inode->i_uid_high = 0; raw_inode->i_gid_high = 0; } @@ -2444,9 +2328,9 @@ diff -NurpP --minimal linux-3.7/fs/ext2/inode.c linux-3.7-vs2.3.5.1/fs/ext2/inod raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); raw_inode->i_size = cpu_to_le32(inode->i_size); raw_inode->i_atime = cpu_to_le32(inode->i_atime.tv_sec); -@@ -1537,7 +1570,8 @@ int ext2_setattr(struct dentry *dentry, - if (is_quota_modification(inode, iattr)) - dquot_initialize(inode); +@@ -1656,7 +1686,8 @@ int ext2_setattr(struct dentry *dentry, + return error; + } if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) || - (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) { + (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid)) || @@ -2454,9 +2338,9 @@ diff -NurpP --minimal linux-3.7/fs/ext2/inode.c linux-3.7-vs2.3.5.1/fs/ext2/inod error = dquot_transfer(inode, iattr); if (error) return error; -diff -NurpP --minimal linux-3.7/fs/ext2/ioctl.c linux-3.7-vs2.3.5.1/fs/ext2/ioctl.c ---- linux-3.7/fs/ext2/ioctl.c 2012-03-19 18:47:25.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext2/ioctl.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/ext2/ioctl.c linux-4.9/fs/ext2/ioctl.c +--- linux-4.9/fs/ext2/ioctl.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/ext2/ioctl.c 2021-02-24 15:47:45.061075282 +0100 @@ -17,6 +17,16 @@ #include @@ -2473,7 +2357,7 @@ diff -NurpP --minimal linux-3.7/fs/ext2/ioctl.c linux-3.7-vs2.3.5.1/fs/ext2/ioct + long ext2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { - struct inode *inode = filp->f_dentry->d_inode; + struct inode *inode = file_inode(filp); @@ -51,6 +61,11 @@ long ext2_ioctl(struct file *filp, unsig flags = ext2_mask_flags(inode->i_mode, flags); @@ -2483,7 +2367,7 @@ diff -NurpP --minimal linux-3.7/fs/ext2/ioctl.c linux-3.7-vs2.3.5.1/fs/ext2/ioct + return -EACCES; + } + - mutex_lock(&inode->i_mutex); + inode_lock(inode); /* Is it quota file? Do not allow user to mess with it */ if (IS_NOQUOTA(inode)) { @@ -66,7 +81,9 @@ long ext2_ioctl(struct file *filp, unsig @@ -2495,7 +2379,7 @@ diff -NurpP --minimal linux-3.7/fs/ext2/ioctl.c linux-3.7-vs2.3.5.1/fs/ext2/ioct + ((flags ^ oldflags) & (EXT2_APPEND_FL | + EXT2_IMMUTABLE_FL | EXT2_IXUNLINK_FL))) { if (!capable(CAP_LINUX_IMMUTABLE)) { - mutex_unlock(&inode->i_mutex); + inode_unlock(inode); ret = -EPERM; @@ -74,7 +91,7 @@ long ext2_ioctl(struct file *filp, unsig } @@ -2506,9 +2390,9 @@ diff -NurpP --minimal linux-3.7/fs/ext2/ioctl.c linux-3.7-vs2.3.5.1/fs/ext2/ioct flags |= oldflags & ~EXT2_FL_USER_MODIFIABLE; ei->i_flags = flags; -diff -NurpP --minimal linux-3.7/fs/ext2/namei.c linux-3.7-vs2.3.5.1/fs/ext2/namei.c ---- linux-3.7/fs/ext2/namei.c 2012-10-04 13:27:39.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext2/namei.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/ext2/namei.c linux-4.9/fs/ext2/namei.c +--- linux-4.9/fs/ext2/namei.c 2021-02-24 15:47:32.254007963 +0100 ++++ linux-4.9/fs/ext2/namei.c 2021-02-24 15:47:45.061075282 +0100 @@ -32,6 +32,7 @@ #include @@ -2517,7 +2401,7 @@ diff -NurpP --minimal linux-3.7/fs/ext2/namei.c linux-3.7-vs2.3.5.1/fs/ext2/name #include "ext2.h" #include "xattr.h" #include "acl.h" -@@ -73,6 +74,7 @@ static struct dentry *ext2_lookup(struct +@@ -71,6 +72,7 @@ static struct dentry *ext2_lookup(struct (unsigned long) ino); return ERR_PTR(-EIO); } @@ -2525,38 +2409,38 @@ diff -NurpP --minimal linux-3.7/fs/ext2/namei.c linux-3.7-vs2.3.5.1/fs/ext2/name } return d_splice_alias(inode, dentry); } -@@ -397,6 +399,7 @@ const struct inode_operations ext2_dir_i - .removexattr = generic_removexattr, +@@ -443,6 +445,7 @@ const struct inode_operations ext2_speci + .listxattr = ext2_listxattr, #endif .setattr = ext2_setattr, + .sync_flags = ext2_sync_flags, .get_acl = ext2_get_acl, + .set_acl = ext2_set_acl, }; - -diff -NurpP --minimal linux-3.7/fs/ext2/super.c linux-3.7-vs2.3.5.1/fs/ext2/super.c ---- linux-3.7/fs/ext2/super.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext2/super.c 2012-12-11 15:56:32.000000000 +0000 -@@ -395,7 +395,8 @@ enum { +diff -urNp -x '*.orig' linux-4.9/fs/ext2/super.c linux-4.9/fs/ext2/super.c +--- linux-4.9/fs/ext2/super.c 2021-02-24 15:47:32.254007963 +0100 ++++ linux-4.9/fs/ext2/super.c 2021-02-24 15:47:45.061075282 +0100 +@@ -411,7 +411,8 @@ enum { Opt_err_ro, Opt_nouid32, Opt_nocheck, Opt_debug, Opt_oldalloc, Opt_orlov, Opt_nobh, Opt_user_xattr, Opt_nouser_xattr, - Opt_acl, Opt_noacl, Opt_xip, Opt_ignore, Opt_err, Opt_quota, + Opt_acl, Opt_noacl, Opt_xip, Opt_dax, Opt_ignore, Opt_err, Opt_quota, - Opt_usrquota, Opt_grpquota, Opt_reservation, Opt_noreservation + Opt_usrquota, Opt_grpquota, Opt_reservation, Opt_noreservation, + Opt_tag, Opt_notag, Opt_tagid }; static const match_table_t tokens = { -@@ -423,6 +424,9 @@ static const match_table_t tokens = { +@@ -439,6 +440,9 @@ static const match_table_t tokens = { {Opt_acl, "acl"}, {Opt_noacl, "noacl"}, {Opt_xip, "xip"}, + {Opt_tag, "tag"}, + {Opt_notag, "notag"}, + {Opt_tagid, "tagid=%u"}, + {Opt_dax, "dax"}, {Opt_grpquota, "grpquota"}, {Opt_ignore, "noquota"}, - {Opt_quota, "quota"}, -@@ -506,6 +510,20 @@ static int parse_options(char *options, +@@ -523,6 +527,20 @@ static int parse_options(char *options, case Opt_nouid32: set_opt (sbi->s_mount_opt, NO_UID32); break; @@ -2577,7 +2461,7 @@ diff -NurpP --minimal linux-3.7/fs/ext2/super.c linux-3.7-vs2.3.5.1/fs/ext2/supe case Opt_nocheck: clear_opt (sbi->s_mount_opt, CHECK); break; -@@ -864,6 +882,8 @@ static int ext2_fill_super(struct super_ +@@ -898,6 +916,8 @@ static int ext2_fill_super(struct super_ if (!parse_options((char *) data, sb)) goto failed_mount; @@ -2586,7 +2470,7 @@ diff -NurpP --minimal linux-3.7/fs/ext2/super.c linux-3.7-vs2.3.5.1/fs/ext2/supe sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | ((EXT2_SB(sb)->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); -@@ -1269,6 +1289,14 @@ static int ext2_remount (struct super_bl +@@ -1311,6 +1331,14 @@ static int ext2_remount (struct super_bl err = -EINVAL; goto restore_opts; } @@ -2601,454 +2485,68 @@ diff -NurpP --minimal linux-3.7/fs/ext2/super.c linux-3.7-vs2.3.5.1/fs/ext2/supe sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | ((sbi->s_mount_opt & EXT2_MOUNT_POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.7/fs/ext3/ext3.h linux-3.7-vs2.3.5.1/fs/ext3/ext3.h ---- linux-3.7/fs/ext3/ext3.h 2012-07-22 21:39:39.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext3/ext3.h 2012-12-11 15:56:32.000000000 +0000 -@@ -151,10 +151,14 @@ struct ext3_group_desc - #define EXT3_NOTAIL_FL 0x00008000 /* file tail should not be merged */ - #define EXT3_DIRSYNC_FL 0x00010000 /* dirsync behaviour (directories only) */ - #define EXT3_TOPDIR_FL 0x00020000 /* Top of directory hierarchies*/ -+#define EXT3_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */ - #define EXT3_RESERVED_FL 0x80000000 /* reserved for ext3 lib */ - --#define EXT3_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */ --#define EXT3_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */ -+#define EXT3_BARRIER_FL 0x04000000 /* Barrier for chroot() */ -+#define EXT3_COW_FL 0x20000000 /* Copy on Write marker */ -+ -+#define EXT3_FL_USER_VISIBLE 0x0103DFFF /* User visible flags */ -+#define EXT3_FL_USER_MODIFIABLE 0x010380FF /* User modifiable flags */ - - /* Flags that should be inherited by new inodes from their parent. */ - #define EXT3_FL_INHERITED (EXT3_SECRM_FL | EXT3_UNRM_FL | EXT3_COMPR_FL |\ -@@ -290,7 +294,8 @@ struct ext3_inode { - __u16 i_pad1; - __le16 l_i_uid_high; /* these 2 fields */ +diff -urNp -x '*.orig' linux-4.9/fs/ext4/ext4.h linux-4.9/fs/ext4/ext4.h +--- linux-4.9/fs/ext4/ext4.h 2021-02-24 15:47:32.254007963 +0100 ++++ linux-4.9/fs/ext4/ext4.h 2021-02-24 15:47:45.064408719 +0100 +@@ -392,8 +392,11 @@ struct flex_groups { + #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ + #define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */ + #define EXT4_EOFBLOCKS_FL 0x00400000 /* Blocks allocated beyond EOF */ ++#define EXT4_BARRIER_FL 0x04000000 /* Barrier for chroot() */ ++#define EXT4_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */ + #define EXT4_INLINE_DATA_FL 0x10000000 /* Inode has inline data. */ + #define EXT4_PROJINHERIT_FL 0x20000000 /* Create with parents projid */ ++#define EXT4_COW_FL 0x40000000 /* Copy on Write marker */ + #define EXT4_RESERVED_FL 0x80000000 /* reserved for ext4 lib */ + + #define EXT4_FL_USER_VISIBLE 0x304BDFFF /* User visible flags */ +@@ -735,7 +738,7 @@ struct ext4_inode { + __le16 l_i_uid_high; /* these 2 fields */ __le16 l_i_gid_high; /* were reserved2[0] */ -- __u32 l_i_reserved2; + __le16 l_i_checksum_lo;/* crc32c(uuid+inum+inode) LE */ +- __le16 l_i_reserved; + __le16 l_i_tag; /* Context Tag */ -+ __u16 l_i_reserved2; } linux2; struct { - __u8 h_i_frag; /* Fragment number */ -@@ -320,6 +325,7 @@ struct ext3_inode { + __le16 h_i_reserved1; /* Obsoleted fragment number/size which are removed in ext4 */ +@@ -892,6 +895,7 @@ do { \ #define i_gid_low i_gid #define i_uid_high osd2.linux2.l_i_uid_high #define i_gid_high osd2.linux2.l_i_gid_high +#define i_raw_tag osd2.linux2.l_i_tag - #define i_reserved2 osd2.linux2.l_i_reserved2 - - /* -@@ -364,6 +370,7 @@ struct ext3_inode { - #define EXT3_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */ - #define EXT3_MOUNT_DATA_ERR_ABORT 0x400000 /* Abort on file data write - * error in ordered mode */ -+#define EXT3_MOUNT_TAGGED (1<<24) /* Enable Context Tags */ - - /* Compatibility, for having both ext2_fs.h and ext3_fs.h included at once */ - #ifndef _LINUX_EXT2_FS_H -@@ -1061,6 +1068,7 @@ extern void ext3_get_inode_flags(struct - extern void ext3_set_aops(struct inode *inode); - extern int ext3_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, - u64 start, u64 len); -+extern int ext3_sync_flags(struct inode *, int, int); - - /* ioctl.c */ - extern long ext3_ioctl(struct file *, unsigned int, unsigned long); -diff -NurpP --minimal linux-3.7/fs/ext3/file.c linux-3.7-vs2.3.5.1/fs/ext3/file.c ---- linux-3.7/fs/ext3/file.c 2012-05-21 16:07:20.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext3/file.c 2012-12-11 15:56:32.000000000 +0000 -@@ -76,5 +76,6 @@ const struct inode_operations ext3_file_ - #endif - .get_acl = ext3_get_acl, - .fiemap = ext3_fiemap, -+ .sync_flags = ext3_sync_flags, - }; - -diff -NurpP --minimal linux-3.7/fs/ext3/ialloc.c linux-3.7-vs2.3.5.1/fs/ext3/ialloc.c ---- linux-3.7/fs/ext3/ialloc.c 2012-07-22 21:39:39.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext3/ialloc.c 2012-12-11 15:56:32.000000000 +0000 -@@ -14,6 +14,7 @@ - - #include - #include -+#include - - #include "ext3.h" - #include "xattr.h" -@@ -469,6 +470,7 @@ got: - inode->i_mode = mode; - inode->i_uid = current_fsuid(); - inode->i_gid = dir->i_gid; -+ inode->i_tag = dx_current_fstag(sb); - } else - inode_init_owner(inode, dir, mode); - -diff -NurpP --minimal linux-3.7/fs/ext3/inode.c linux-3.7-vs2.3.5.1/fs/ext3/inode.c ---- linux-3.7/fs/ext3/inode.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext3/inode.c 2012-12-11 19:24:12.000000000 +0000 -@@ -27,6 +27,8 @@ - #include - #include - #include -+#include -+ - #include "ext3.h" - #include "xattr.h" - #include "acl.h" -@@ -2848,36 +2850,60 @@ void ext3_set_inode_flags(struct inode * - { - unsigned int flags = EXT3_I(inode)->i_flags; - -- inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC); -+ inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK | -+ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC); -+ -+ if (flags & EXT3_IMMUTABLE_FL) -+ inode->i_flags |= S_IMMUTABLE; -+ if (flags & EXT3_IXUNLINK_FL) -+ inode->i_flags |= S_IXUNLINK; -+ - if (flags & EXT3_SYNC_FL) - inode->i_flags |= S_SYNC; - if (flags & EXT3_APPEND_FL) - inode->i_flags |= S_APPEND; -- if (flags & EXT3_IMMUTABLE_FL) -- inode->i_flags |= S_IMMUTABLE; - if (flags & EXT3_NOATIME_FL) - inode->i_flags |= S_NOATIME; - if (flags & EXT3_DIRSYNC_FL) - inode->i_flags |= S_DIRSYNC; -+ -+ inode->i_vflags &= ~(V_BARRIER | V_COW); -+ -+ if (flags & EXT3_BARRIER_FL) -+ inode->i_vflags |= V_BARRIER; -+ if (flags & EXT3_COW_FL) -+ inode->i_vflags |= V_COW; - } - - /* Propagate flags from i_flags to EXT3_I(inode)->i_flags */ - void ext3_get_inode_flags(struct ext3_inode_info *ei) - { - unsigned int flags = ei->vfs_inode.i_flags; -+ unsigned int vflags = ei->vfs_inode.i_vflags; -+ -+ ei->i_flags &= ~(EXT3_SYNC_FL | EXT3_APPEND_FL | -+ EXT3_IMMUTABLE_FL | EXT3_IXUNLINK_FL | -+ EXT3_NOATIME_FL | EXT3_DIRSYNC_FL | -+ EXT3_BARRIER_FL | EXT3_COW_FL); -+ -+ if (flags & S_IMMUTABLE) -+ ei->i_flags |= EXT3_IMMUTABLE_FL; -+ if (flags & S_IXUNLINK) -+ ei->i_flags |= EXT3_IXUNLINK_FL; - -- ei->i_flags &= ~(EXT3_SYNC_FL|EXT3_APPEND_FL| -- EXT3_IMMUTABLE_FL|EXT3_NOATIME_FL|EXT3_DIRSYNC_FL); - if (flags & S_SYNC) - ei->i_flags |= EXT3_SYNC_FL; - if (flags & S_APPEND) - ei->i_flags |= EXT3_APPEND_FL; -- if (flags & S_IMMUTABLE) -- ei->i_flags |= EXT3_IMMUTABLE_FL; - if (flags & S_NOATIME) - ei->i_flags |= EXT3_NOATIME_FL; - if (flags & S_DIRSYNC) - ei->i_flags |= EXT3_DIRSYNC_FL; -+ -+ if (vflags & V_BARRIER) -+ ei->i_flags |= EXT3_BARRIER_FL; -+ if (vflags & V_COW) -+ ei->i_flags |= EXT3_COW_FL; - } - - struct inode *ext3_iget(struct super_block *sb, unsigned long ino) -@@ -2915,8 +2941,10 @@ struct inode *ext3_iget(struct super_blo - i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16; - i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16; - } -- i_uid_write(inode, i_uid); -- i_gid_write(inode, i_gid); -+ i_uid_write(inode, INOTAG_UID(DX_TAG(inode), i_uid, i_gid)); -+ i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid)); -+ i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), i_uid, i_gid, -+ le16_to_cpu(raw_inode->i_raw_tag))); - set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); - inode->i_size = le32_to_cpu(raw_inode->i_size); - inode->i_atime.tv_sec = (signed)le32_to_cpu(raw_inode->i_atime); -@@ -3088,8 +3116,10 @@ again: - - ext3_get_inode_flags(ei); - raw_inode->i_mode = cpu_to_le16(inode->i_mode); -- i_uid = i_uid_read(inode); -- i_gid = i_gid_read(inode); -+ i_uid = TAGINO_UID(DX_TAG(inode), -+ i_uid_read(inode), i_tag_read(inode)); -+ i_gid = TAGINO_GID(DX_TAG(inode), -+ i_gid_read(inode), i_tag_read(inode)); - if(!(test_opt(inode->i_sb, NO_UID32))) { - raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid)); - raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid)); -@@ -3114,6 +3144,9 @@ again: - raw_inode->i_uid_high = 0; - raw_inode->i_gid_high = 0; - } -+#ifdef CONFIG_TAGGING_INTERN -+ raw_inode->i_raw_tag = cpu_to_le16(i_tag_read(inode)); -+#endif - raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); - disksize = cpu_to_le32(ei->i_disksize); - if (disksize != raw_inode->i_size) { -@@ -3282,7 +3315,8 @@ int ext3_setattr(struct dentry *dentry, - if (is_quota_modification(inode, attr)) - dquot_initialize(inode); - if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) || -- (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid))) { -+ (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid)) || -+ (ia_valid & ATTR_TAG && !tag_eq(attr->ia_tag, inode->i_tag))) { - handle_t *handle; - - /* (user+group)*(old+new) structure, inode write (sb, -@@ -3304,6 +3338,8 @@ int ext3_setattr(struct dentry *dentry, - inode->i_uid = attr->ia_uid; - if (attr->ia_valid & ATTR_GID) - inode->i_gid = attr->ia_gid; -+ if ((attr->ia_valid & ATTR_TAG) && IS_TAGGED(inode)) -+ inode->i_tag = attr->ia_tag; - error = ext3_mark_inode_dirty(handle, inode); - ext3_journal_stop(handle); - } -diff -NurpP --minimal linux-3.7/fs/ext3/ioctl.c linux-3.7-vs2.3.5.1/fs/ext3/ioctl.c ---- linux-3.7/fs/ext3/ioctl.c 2012-05-21 16:07:20.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext3/ioctl.c 2012-12-11 15:56:32.000000000 +0000 -@@ -12,6 +12,34 @@ - #include - #include "ext3.h" - -+ -+int ext3_sync_flags(struct inode *inode, int flags, int vflags) -+{ -+ handle_t *handle = NULL; -+ struct ext3_iloc iloc; -+ int err; -+ -+ handle = ext3_journal_start(inode, 1); -+ if (IS_ERR(handle)) -+ return PTR_ERR(handle); -+ -+ if (IS_SYNC(inode)) -+ handle->h_sync = 1; -+ err = ext3_reserve_inode_write(handle, inode, &iloc); -+ if (err) -+ goto flags_err; -+ -+ inode->i_flags = flags; -+ inode->i_vflags = vflags; -+ ext3_get_inode_flags(EXT3_I(inode)); -+ inode->i_ctime = CURRENT_TIME_SEC; -+ -+ err = ext3_mark_iloc_dirty(handle, inode, &iloc); -+flags_err: -+ ext3_journal_stop(handle); -+ return err; -+} -+ - long ext3_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) - { - struct inode *inode = filp->f_dentry->d_inode; -@@ -45,6 +73,11 @@ long ext3_ioctl(struct file *filp, unsig - - flags = ext3_mask_flags(inode->i_mode, flags); - -+ if (IS_BARRIER(inode)) { -+ vxwprintk_task(1, "messing with the barrier."); -+ return -EACCES; -+ } -+ - mutex_lock(&inode->i_mutex); - - /* Is it quota file? Do not allow user to mess with it */ -@@ -63,7 +96,9 @@ long ext3_ioctl(struct file *filp, unsig - * - * This test looks nicer. Thanks to Pauline Middelink - */ -- if ((flags ^ oldflags) & (EXT3_APPEND_FL | EXT3_IMMUTABLE_FL)) { -+ if ((oldflags & EXT3_IMMUTABLE_FL) || -+ ((flags ^ oldflags) & (EXT3_APPEND_FL | -+ EXT3_IMMUTABLE_FL | EXT3_IXUNLINK_FL))) { - if (!capable(CAP_LINUX_IMMUTABLE)) - goto flags_out; - } -@@ -88,7 +123,7 @@ long ext3_ioctl(struct file *filp, unsig - if (err) - goto flags_err; - -- flags = flags & EXT3_FL_USER_MODIFIABLE; -+ flags &= EXT3_FL_USER_MODIFIABLE; - flags |= oldflags & ~EXT3_FL_USER_MODIFIABLE; - ei->i_flags = flags; - -diff -NurpP --minimal linux-3.7/fs/ext3/namei.c linux-3.7-vs2.3.5.1/fs/ext3/namei.c ---- linux-3.7/fs/ext3/namei.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext3/namei.c 2012-12-11 15:56:32.000000000 +0000 -@@ -25,6 +25,8 @@ - */ - - #include -+#include -+ - #include "ext3.h" - #include "namei.h" - #include "xattr.h" -@@ -919,6 +921,7 @@ restart: - submit_bh(READ | REQ_META | REQ_PRIO, - bh); - } -+ dx_propagate_tag(nd, inode); - } - } - if ((bh = bh_use[ra_ptr++]) == NULL) -@@ -2528,6 +2531,7 @@ const struct inode_operations ext3_dir_i - .listxattr = ext3_listxattr, - .removexattr = generic_removexattr, - #endif -+ .sync_flags = ext3_sync_flags, - .get_acl = ext3_get_acl, - }; - -diff -NurpP --minimal linux-3.7/fs/ext3/super.c linux-3.7-vs2.3.5.1/fs/ext3/super.c ---- linux-3.7/fs/ext3/super.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext3/super.c 2012-12-11 15:56:32.000000000 +0000 -@@ -816,7 +816,8 @@ enum { - Opt_usrjquota, Opt_grpjquota, Opt_offusrjquota, Opt_offgrpjquota, - Opt_jqfmt_vfsold, Opt_jqfmt_vfsv0, Opt_jqfmt_vfsv1, Opt_quota, - Opt_noquota, Opt_ignore, Opt_barrier, Opt_nobarrier, Opt_err, -- Opt_resize, Opt_usrquota, Opt_grpquota -+ Opt_resize, Opt_usrquota, Opt_grpquota, -+ Opt_tag, Opt_notag, Opt_tagid - }; - - static const match_table_t tokens = { -@@ -873,6 +874,9 @@ static const match_table_t tokens = { - {Opt_barrier, "barrier"}, - {Opt_nobarrier, "nobarrier"}, - {Opt_resize, "resize"}, -+ {Opt_tag, "tag"}, -+ {Opt_notag, "notag"}, -+ {Opt_tagid, "tagid=%u"}, - {Opt_err, NULL}, - }; - -@@ -1038,6 +1042,20 @@ static int parse_options (char *options, - case Opt_nouid32: - set_opt (sbi->s_mount_opt, NO_UID32); - break; -+#ifndef CONFIG_TAGGING_NONE -+ case Opt_tag: -+ set_opt (sbi->s_mount_opt, TAGGED); -+ break; -+ case Opt_notag: -+ clear_opt (sbi->s_mount_opt, TAGGED); -+ break; -+#endif -+#ifdef CONFIG_PROPAGATE -+ case Opt_tagid: -+ /* use args[0] */ -+ set_opt (sbi->s_mount_opt, TAGGED); -+ break; -+#endif - case Opt_nocheck: - clear_opt (sbi->s_mount_opt, CHECK); - break; -@@ -1738,6 +1756,9 @@ static int ext3_fill_super (struct super - NULL, 0)) - goto failed_mount; - -+ if (EXT3_SB(sb)->s_mount_opt & EXT3_MOUNT_TAGGED) -+ sb->s_flags |= MS_TAGGED; -+ - sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | - (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); - -@@ -2622,6 +2643,14 @@ static int ext3_remount (struct super_bl - if (test_opt(sb, ABORT)) - ext3_abort(sb, __func__, "Abort forced by user"); - -+ if ((sbi->s_mount_opt & EXT3_MOUNT_TAGGED) && -+ !(sb->s_flags & MS_TAGGED)) { -+ printk("EXT3-fs: %s: tagging not permitted on remount.\n", -+ sb->s_id); -+ err = -EINVAL; -+ goto restore_opts; -+ } -+ - sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | - (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); - -diff -NurpP --minimal linux-3.7/fs/ext4/ext4.h linux-3.7-vs2.3.5.1/fs/ext4/ext4.h ---- linux-3.7/fs/ext4/ext4.h 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext4/ext4.h 2012-12-11 15:56:32.000000000 +0000 -@@ -392,8 +392,12 @@ struct flex_groups { - #define EXT4_EXTENTS_FL 0x00080000 /* Inode uses extents */ - #define EXT4_EA_INODE_FL 0x00200000 /* Inode used for large EA */ - #define EXT4_EOFBLOCKS_FL 0x00400000 /* Blocks allocated beyond EOF */ -+#define EXT4_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */ - #define EXT4_RESERVED_FL 0x80000000 /* reserved for ext4 lib */ - -+#define EXT4_BARRIER_FL 0x04000000 /* Barrier for chroot() */ -+#define EXT4_COW_FL 0x20000000 /* Copy on Write marker */ -+ - #define EXT4_FL_USER_VISIBLE 0x004BDFFF /* User visible flags */ - #define EXT4_FL_USER_MODIFIABLE 0x004B80FF /* User modifiable flags */ - -@@ -665,7 +669,7 @@ struct ext4_inode { - __le16 l_i_uid_high; /* these 2 fields */ - __le16 l_i_gid_high; /* were reserved2[0] */ - __le16 l_i_checksum_lo;/* crc32c(uuid+inum+inode) LE */ -- __le16 l_i_reserved; -+ __le16 l_i_tag; /* Context Tag */ - } linux2; - struct { - __le16 h_i_reserved1; /* Obsoleted fragment number/size which are removed in ext4 */ -@@ -783,6 +787,7 @@ do { \ - #define i_gid_low i_gid - #define i_uid_high osd2.linux2.l_i_uid_high - #define i_gid_high osd2.linux2.l_i_gid_high -+#define i_raw_tag osd2.linux2.l_i_tag - #define i_checksum_lo osd2.linux2.l_i_checksum_lo + #define i_checksum_lo osd2.linux2.l_i_checksum_lo #elif defined(__GNU__) -@@ -961,6 +966,7 @@ struct ext4_inode_info { - #define EXT4_MOUNT_POSIX_ACL 0x08000 /* POSIX Access Control Lists */ - #define EXT4_MOUNT_NO_AUTO_DA_ALLOC 0x10000 /* No auto delalloc mapping */ - #define EXT4_MOUNT_BARRIER 0x20000 /* Use block barriers */ -+#define EXT4_MOUNT_TAGGED 0x40000 /* Enable Context Tags */ - #define EXT4_MOUNT_QUOTA 0x80000 /* Some quota option set */ - #define EXT4_MOUNT_USRQUOTA 0x100000 /* "old" user quota */ - #define EXT4_MOUNT_GRPQUOTA 0x200000 /* "old" group quota */ -@@ -2412,6 +2418,7 @@ extern int ext4_map_blocks(handle_t *han - struct ext4_map_blocks *map, int flags); - extern int ext4_fiemap(struct inode *inode, struct fiemap_extent_info *fieinfo, - __u64 start, __u64 len); +@@ -1133,6 +1137,7 @@ struct ext4_inode_info { + #define EXT4_MOUNT_DIOREAD_NOLOCK 0x400000 /* Enable support for dio read nolocking */ + #define EXT4_MOUNT_JOURNAL_CHECKSUM 0x800000 /* Journal checksums */ + #define EXT4_MOUNT_JOURNAL_ASYNC_COMMIT 0x1000000 /* Journal Async Commit */ ++#define EXT4_MOUNT_TAGGED 0x2000000 /* Enable Context Tags */ + #define EXT4_MOUNT_DELALLOC 0x8000000 /* Delalloc support */ + #define EXT4_MOUNT_DATA_ERR_ABORT 0x10000000 /* Abort on file data write */ + #define EXT4_MOUNT_BLOCK_VALIDITY 0x20000000 /* Block validity checking */ +@@ -2527,6 +2532,7 @@ extern int ext4_punch_hole(struct inode + extern int ext4_truncate_restart_trans(handle_t *, struct inode *, int nblocks); + extern void ext4_set_inode_flags(struct inode *); + extern void ext4_get_inode_flags(struct ext4_inode_info *); +extern int ext4_sync_flags(struct inode *, int, int); - /* move_extent.c */ - extern int ext4_move_extents(struct file *o_filp, struct file *d_filp, - __u64 start_orig, __u64 start_donor, -diff -NurpP --minimal linux-3.7/fs/ext4/file.c linux-3.7-vs2.3.5.1/fs/ext4/file.c ---- linux-3.7/fs/ext4/file.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext4/file.c 2012-12-11 15:56:32.000000000 +0000 -@@ -334,5 +334,6 @@ const struct inode_operations ext4_file_ - #endif + extern int ext4_alloc_da_blocks(struct inode *inode); + extern void ext4_set_aops(struct inode *inode); + extern int ext4_writepage_trans_blocks(struct inode *); +diff -urNp -x '*.orig' linux-4.9/fs/ext4/file.c linux-4.9/fs/ext4/file.c +--- linux-4.9/fs/ext4/file.c 2021-02-24 15:47:32.257341400 +0100 ++++ linux-4.9/fs/ext4/file.c 2021-02-24 15:47:45.064408719 +0100 +@@ -698,5 +698,6 @@ const struct inode_operations ext4_file_ .get_acl = ext4_get_acl, + .set_acl = ext4_set_acl, .fiemap = ext4_fiemap, + .sync_flags = ext4_sync_flags, }; -diff -NurpP --minimal linux-3.7/fs/ext4/ialloc.c linux-3.7-vs2.3.5.1/fs/ext4/ialloc.c ---- linux-3.7/fs/ext4/ialloc.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext4/ialloc.c 2012-12-11 15:56:32.000000000 +0000 -@@ -22,6 +22,7 @@ +diff -urNp -x '*.orig' linux-4.9/fs/ext4/ialloc.c linux-4.9/fs/ext4/ialloc.c +--- linux-4.9/fs/ext4/ialloc.c 2021-02-24 15:47:32.257341400 +0100 ++++ linux-4.9/fs/ext4/ialloc.c 2021-02-24 15:47:45.064408719 +0100 +@@ -21,6 +21,7 @@ #include #include #include @@ -3056,55 +2554,59 @@ diff -NurpP --minimal linux-3.7/fs/ext4/ialloc.c linux-3.7-vs2.3.5.1/fs/ext4/ial #include #include "ext4.h" -@@ -848,6 +849,7 @@ got: +@@ -780,6 +781,7 @@ struct inode *__ext4_new_inode(handle_t inode->i_mode = mode; inode->i_uid = current_fsuid(); inode->i_gid = dir->i_gid; -+ inode->i_tag = dx_current_fstag(sb); ++ i_tag_write(inode, dx_current_fstag(sb)); } else inode_init_owner(inode, dir, mode); -diff -NurpP --minimal linux-3.7/fs/ext4/inode.c linux-3.7-vs2.3.5.1/fs/ext4/inode.c ---- linux-3.7/fs/ext4/inode.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext4/inode.c 2012-12-11 19:25:58.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/ext4/inode.c linux-4.9/fs/ext4/inode.c +--- linux-4.9/fs/ext4/inode.c 2021-02-24 15:47:32.260674838 +0100 ++++ linux-4.9/fs/ext4/inode.c 2021-02-24 15:47:45.064408719 +0100 @@ -37,6 +37,7 @@ #include #include - #include + #include +#include #include "ext4_jbd2.h" #include "xattr.h" -@@ -3695,41 +3696,64 @@ void ext4_set_inode_flags(struct inode * - { +@@ -4399,12 +4400,15 @@ void ext4_set_inode_flags(struct inode * unsigned int flags = EXT4_I(inode)->i_flags; + unsigned int new_fl = 0; -- inode->i_flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC); -+ inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK | -+ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC); -+ + if (flags & EXT4_IMMUTABLE_FL) -+ inode->i_flags |= S_IMMUTABLE; ++ new_fl |= S_IMMUTABLE; + if (flags & EXT4_IXUNLINK_FL) -+ inode->i_flags |= S_IXUNLINK; ++ new_fl |= S_IXUNLINK; + if (flags & EXT4_SYNC_FL) - inode->i_flags |= S_SYNC; + new_fl |= S_SYNC; if (flags & EXT4_APPEND_FL) - inode->i_flags |= S_APPEND; + new_fl |= S_APPEND; - if (flags & EXT4_IMMUTABLE_FL) -- inode->i_flags |= S_IMMUTABLE; +- new_fl |= S_IMMUTABLE; if (flags & EXT4_NOATIME_FL) - inode->i_flags |= S_NOATIME; + new_fl |= S_NOATIME; if (flags & EXT4_DIRSYNC_FL) - inode->i_flags |= S_DIRSYNC; -+ -+ inode->i_vflags &= ~(V_BARRIER | V_COW); +@@ -4412,31 +4416,52 @@ void ext4_set_inode_flags(struct inode * + if (test_opt(inode->i_sb, DAX) && S_ISREG(inode->i_mode)) + new_fl |= S_DAX; + inode_set_flags(inode, new_fl, +- S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_DAX); ++ S_IXUNLINK | S_IMMUTABLE | S_DAX | ++ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC); + ++ new_fl = 0; + if (flags & EXT4_BARRIER_FL) -+ inode->i_vflags |= V_BARRIER; ++ new_fl |= V_BARRIER; + if (flags & EXT4_COW_FL) -+ inode->i_vflags |= V_COW; ++ new_fl |= V_COW; ++ ++ set_mask_bits(&inode->i_vflags, ++ V_BARRIER | V_COW, new_fl); } /* Propagate flags from i_flags to EXT4_I(inode)->i_flags */ @@ -3147,7 +2649,7 @@ diff -NurpP --minimal linux-3.7/fs/ext4/inode.c linux-3.7-vs2.3.5.1/fs/ext4/inod } while (cmpxchg(&ei->i_flags, old_fl, new_fl) != old_fl); } -@@ -3821,8 +3845,10 @@ struct inode *ext4_iget(struct super_blo +@@ -4584,8 +4609,10 @@ struct inode *__ext4_iget(struct super_b i_uid |= le16_to_cpu(raw_inode->i_uid_high) << 16; i_gid |= le16_to_cpu(raw_inode->i_gid_high) << 16; } @@ -3157,23 +2659,23 @@ diff -NurpP --minimal linux-3.7/fs/ext4/inode.c linux-3.7-vs2.3.5.1/fs/ext4/inod + i_gid_write(inode, INOTAG_GID(DX_TAG(inode), i_uid, i_gid)); + i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), i_uid, i_gid, + le16_to_cpu(raw_inode->i_raw_tag))); + ei->i_projid = make_kprojid(&init_user_ns, i_projid); set_nlink(inode, le16_to_cpu(raw_inode->i_links_count)); - ext4_clear_state_flags(ei); /* Only relevant on 32-bit archs */ -@@ -4046,8 +4072,10 @@ static int ext4_do_update_inode(handle_t +@@ -4909,8 +4936,10 @@ static int ext4_do_update_inode(handle_t ext4_get_inode_flags(ei); raw_inode->i_mode = cpu_to_le16(inode->i_mode); - i_uid = i_uid_read(inode); - i_gid = i_gid_read(inode); -+ i_uid = TAGINO_UID(DX_TAG(inode), -+ i_uid_read(inode), i_tag_read(inode)); -+ i_gid = TAGINO_GID(DX_TAG(inode), -+ i_gid_read(inode), i_tag_read(inode)); ++ i_uid = from_kuid(&init_user_ns, ++ TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag)); ++ i_gid = from_kgid(&init_user_ns, ++ TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag)); + i_projid = from_kprojid(&init_user_ns, ei->i_projid); if (!(test_opt(inode->i_sb, NO_UID32))) { raw_inode->i_uid_low = cpu_to_le16(low_16_bits(i_uid)); - raw_inode->i_gid_low = cpu_to_le16(low_16_bits(i_gid)); -@@ -4070,6 +4098,9 @@ static int ext4_do_update_inode(handle_t +@@ -4934,6 +4963,9 @@ static int ext4_do_update_inode(handle_t raw_inode->i_uid_high = 0; raw_inode->i_gid_high = 0; } @@ -3183,9 +2685,9 @@ diff -NurpP --minimal linux-3.7/fs/ext4/inode.c linux-3.7-vs2.3.5.1/fs/ext4/inod raw_inode->i_links_count = cpu_to_le16(inode->i_nlink); EXT4_INODE_SET_XTIME(i_ctime, inode, raw_inode); -@@ -4258,7 +4289,8 @@ int ext4_setattr(struct dentry *dentry, - if (is_quota_modification(inode, attr)) - dquot_initialize(inode); +@@ -5191,7 +5223,8 @@ int ext4_setattr(struct dentry *dentry, + return error; + } if ((ia_valid & ATTR_UID && !uid_eq(attr->ia_uid, inode->i_uid)) || - (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid))) { + (ia_valid & ATTR_GID && !gid_eq(attr->ia_gid, inode->i_gid)) || @@ -3193,7 +2695,7 @@ diff -NurpP --minimal linux-3.7/fs/ext4/inode.c linux-3.7-vs2.3.5.1/fs/ext4/inod handle_t *handle; /* (user+group)*(old+new) structure, inode write (sb, -@@ -4280,6 +4312,8 @@ int ext4_setattr(struct dentry *dentry, +@@ -5214,6 +5247,8 @@ int ext4_setattr(struct dentry *dentry, inode->i_uid = attr->ia_uid; if (attr->ia_valid & ATTR_GID) inode->i_gid = attr->ia_gid; @@ -3202,19 +2704,31 @@ diff -NurpP --minimal linux-3.7/fs/ext4/inode.c linux-3.7-vs2.3.5.1/fs/ext4/inod error = ext4_mark_inode_dirty(handle, inode); ext4_journal_stop(handle); } -diff -NurpP --minimal linux-3.7/fs/ext4/ioctl.c linux-3.7-vs2.3.5.1/fs/ext4/ioctl.c ---- linux-3.7/fs/ext4/ioctl.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext4/ioctl.c 2012-12-11 15:56:32.000000000 +0000 -@@ -14,12 +14,40 @@ - #include - #include +diff -urNp -x '*.orig' linux-4.9/fs/ext4/ioctl.c linux-4.9/fs/ext4/ioctl.c +--- linux-4.9/fs/ext4/ioctl.c 2021-02-24 15:47:32.260674838 +0100 ++++ linux-4.9/fs/ext4/ioctl.c 2021-02-24 15:47:45.064408719 +0100 +@@ -15,6 +15,7 @@ #include + #include + #include +#include #include #include "ext4_jbd2.h" #include "ext4.h" - - #define MAX_32_NUM ((((unsigned long long) 1) << 32) - 1) +@@ -226,7 +227,9 @@ static int ext4_ioctl_setflags(struct in + * + * This test looks nicer. Thanks to Pauline Middelink + */ +- if ((flags ^ oldflags) & (EXT4_APPEND_FL | EXT4_IMMUTABLE_FL)) { ++ if ((oldflags & EXT4_IMMUTABLE_FL) || ++ ((flags ^ oldflags) & (EXT4_APPEND_FL | ++ EXT4_IMMUTABLE_FL | EXT4_IXUNLINK_FL))) { + if (!capable(CAP_LINUX_IMMUTABLE)) + goto flags_out; + } +@@ -432,6 +435,33 @@ static inline unsigned long ext4_xflags_ + return iflags; + } +int ext4_sync_flags(struct inode *inode, int flags, int vflags) +{ @@ -3222,7 +2736,7 @@ diff -NurpP --minimal linux-3.7/fs/ext4/ioctl.c linux-3.7-vs2.3.5.1/fs/ext4/ioct + struct ext4_iloc iloc; + int err; + -+ handle = ext4_journal_start(inode, 1); ++ handle = ext4_journal_start(inode, EXT4_HT_INODE, 1); + if (IS_ERR(handle)) + return PTR_ERR(handle); + @@ -3245,8 +2759,8 @@ diff -NurpP --minimal linux-3.7/fs/ext4/ioctl.c linux-3.7-vs2.3.5.1/fs/ext4/ioct + long ext4_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { - struct inode *inode = filp->f_dentry->d_inode; -@@ -53,6 +81,11 @@ long ext4_ioctl(struct file *filp, unsig + struct inode *inode = file_inode(filp); +@@ -461,6 +491,11 @@ long ext4_ioctl(struct file *filp, unsig flags = ext4_mask_flags(inode->i_mode, flags); @@ -3255,24 +2769,13 @@ diff -NurpP --minimal linux-3.7/fs/ext4/ioctl.c linux-3.7-vs2.3.5.1/fs/ext4/ioct + return -EACCES; + } + - err = -EPERM; - mutex_lock(&inode->i_mutex); - /* Is it quota file? Do not allow user to mess with it */ -@@ -70,7 +103,9 @@ long ext4_ioctl(struct file *filp, unsig - * - * This test looks nicer. Thanks to Pauline Middelink - */ -- if ((flags ^ oldflags) & (EXT4_APPEND_FL | EXT4_IMMUTABLE_FL)) { -+ if ((oldflags & EXT4_IMMUTABLE_FL) || -+ ((flags ^ oldflags) & (EXT4_APPEND_FL | -+ EXT4_IMMUTABLE_FL | EXT4_IXUNLINK_FL))) { - if (!capable(CAP_LINUX_IMMUTABLE)) - goto flags_out; - } -diff -NurpP --minimal linux-3.7/fs/ext4/namei.c linux-3.7-vs2.3.5.1/fs/ext4/namei.c ---- linux-3.7/fs/ext4/namei.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext4/namei.c 2012-12-11 15:56:32.000000000 +0000 -@@ -34,6 +34,7 @@ + inode_lock(inode); + err = ext4_ioctl_setflags(inode, flags); + inode_unlock(inode); +diff -urNp -x '*.orig' linux-4.9/fs/ext4/namei.c linux-4.9/fs/ext4/namei.c +--- linux-4.9/fs/ext4/namei.c 2021-02-24 15:47:32.260674838 +0100 ++++ linux-4.9/fs/ext4/namei.c 2021-02-24 15:47:45.064408719 +0100 +@@ -33,6 +33,7 @@ #include #include #include @@ -3280,35 +2783,34 @@ diff -NurpP --minimal linux-3.7/fs/ext4/namei.c linux-3.7-vs2.3.5.1/fs/ext4/name #include "ext4.h" #include "ext4_jbd2.h" -@@ -1232,6 +1233,7 @@ restart: - ll_rw_block(READ | REQ_META | REQ_PRIO, +@@ -1457,6 +1458,7 @@ restart: + REQ_META | REQ_PRIO, 1, &bh); } + dx_propagate_tag(nd, inode); } if ((bh = bh_use[ra_ptr++]) == NULL) goto next; -@@ -3051,6 +3053,7 @@ const struct inode_operations ext4_dir_i - #endif +@@ -3935,6 +3937,7 @@ const struct inode_operations ext4_dir_i .get_acl = ext4_get_acl, + .set_acl = ext4_set_acl, .fiemap = ext4_fiemap, + .sync_flags = ext4_sync_flags, }; const struct inode_operations ext4_special_inode_operations = { -diff -NurpP --minimal linux-3.7/fs/ext4/super.c linux-3.7-vs2.3.5.1/fs/ext4/super.c ---- linux-3.7/fs/ext4/super.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ext4/super.c 2012-12-11 19:16:16.000000000 +0000 -@@ -1222,7 +1222,7 @@ enum { - Opt_inode_readahead_blks, Opt_journal_ioprio, +diff -urNp -x '*.orig' linux-4.9/fs/ext4/super.c linux-4.9/fs/ext4/super.c +--- linux-4.9/fs/ext4/super.c 2021-02-24 15:47:32.264008276 +0100 ++++ linux-4.9/fs/ext4/super.c 2021-02-24 15:47:45.067742158 +0100 +@@ -1294,6 +1294,7 @@ enum { Opt_dioread_nolock, Opt_dioread_lock, Opt_discard, Opt_nodiscard, Opt_init_itable, Opt_noinit_itable, -- Opt_max_dir_size_kb, -+ Opt_max_dir_size_kb, Opt_tag, Opt_notag, Opt_tagid + Opt_max_dir_size_kb, Opt_nojournal_checksum, ++ Opt_tag, Opt_notag, Opt_tagid }; static const match_table_t tokens = { -@@ -1302,6 +1302,9 @@ static const match_table_t tokens = { +@@ -1380,6 +1381,9 @@ static const match_table_t tokens = { {Opt_removed, "reservation"}, /* mount option from ext2/3 */ {Opt_removed, "noreservation"}, /* mount option from ext2/3 */ {Opt_removed, "journal=%u"}, /* mount option from ext2/3 */ @@ -3318,9 +2820,9 @@ diff -NurpP --minimal linux-3.7/fs/ext4/super.c linux-3.7-vs2.3.5.1/fs/ext4/supe {Opt_err, NULL}, }; -@@ -1549,6 +1552,20 @@ static int handle_mount_opt(struct super - return -1; - *journal_ioprio = IOPRIO_PRIO_VALUE(IOPRIO_CLASS_BE, arg); +@@ -1625,6 +1629,20 @@ static int handle_mount_opt(struct super + case Opt_nolazytime: + sb->s_flags &= ~MS_LAZYTIME; return 1; +#ifndef CONFIG_TAGGING_NONE + case Opt_tag: @@ -3338,9 +2840,9 @@ diff -NurpP --minimal linux-3.7/fs/ext4/super.c linux-3.7-vs2.3.5.1/fs/ext4/supe +#endif } - for (m = ext4_mount_opts; m->token != Opt_err; m++) { -@@ -3455,6 +3472,9 @@ static int ext4_fill_super(struct super_ - } + for (m = ext4_mount_opts; m->token != Opt_err; m++) +@@ -3645,6 +3663,9 @@ static int ext4_fill_super(struct super_ + sb->s_iflags |= SB_I_CGROUPWB; } + if (EXT4_SB(sb)->s_mount_opt & EXT4_MOUNT_TAGGED) @@ -3349,7 +2851,7 @@ diff -NurpP --minimal linux-3.7/fs/ext4/super.c linux-3.7-vs2.3.5.1/fs/ext4/supe sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -@@ -4618,6 +4638,14 @@ static int ext4_remount(struct super_blo +@@ -5032,6 +5053,14 @@ static int ext4_remount(struct super_blo if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED) ext4_abort(sb, "Abort forced by user"); @@ -3364,18 +2866,18 @@ diff -NurpP --minimal linux-3.7/fs/ext4/super.c linux-3.7-vs2.3.5.1/fs/ext4/supe sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); -diff -NurpP --minimal linux-3.7/fs/fcntl.c linux-3.7-vs2.3.5.1/fs/fcntl.c ---- linux-3.7/fs/fcntl.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/fcntl.c 2012-12-11 15:56:32.000000000 +0000 -@@ -21,6 +21,7 @@ - #include +diff -urNp -x '*.orig' linux-4.9/fs/fcntl.c linux-4.9/fs/fcntl.c +--- linux-4.9/fs/fcntl.c 2021-02-24 15:47:32.270675151 +0100 ++++ linux-4.9/fs/fcntl.c 2021-02-24 15:47:45.067742158 +0100 +@@ -22,6 +22,7 @@ #include #include + #include +#include #include #include -@@ -378,6 +379,8 @@ SYSCALL_DEFINE3(fcntl64, unsigned int, f +@@ -390,6 +391,8 @@ SYSCALL_DEFINE3(fcntl64, unsigned int, f if (!f.file) goto out; @@ -3384,18 +2886,18 @@ diff -NurpP --minimal linux-3.7/fs/fcntl.c linux-3.7-vs2.3.5.1/fs/fcntl.c if (unlikely(f.file->f_mode & FMODE_PATH)) { if (!check_fcntl_cmd(cmd)) -diff -NurpP --minimal linux-3.7/fs/file.c linux-3.7-vs2.3.5.1/fs/file.c ---- linux-3.7/fs/file.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/file.c 2012-12-11 21:51:51.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/file.c linux-4.9/fs/file.c +--- linux-4.9/fs/file.c 2021-02-24 15:47:32.270675151 +0100 ++++ linux-4.9/fs/file.c 2021-02-24 15:47:45.067742158 +0100 @@ -22,6 +22,7 @@ #include #include #include +#include - struct fdtable_defer { - spinlock_t lock; -@@ -364,6 +365,8 @@ struct files_struct *dup_fd(struct files + unsigned int sysctl_nr_open __read_mostly = 1024*1024; + unsigned int sysctl_nr_open_min = BITS_PER_LONG; +@@ -357,6 +358,8 @@ struct files_struct *dup_fd(struct files struct file *f = *old_fds++; if (f) { get_file(f); @@ -3404,9 +2906,9 @@ diff -NurpP --minimal linux-3.7/fs/file.c linux-3.7-vs2.3.5.1/fs/file.c } else { /* * The fd may be claimed in the fd bitmap but not yet -@@ -429,9 +432,11 @@ static void close_files(struct files_str +@@ -406,9 +409,11 @@ static struct fdtable *close_files(struc filp_close(file, files); - cond_resched(); + cond_resched_rcu_qs(); } + vx_openfd_dec(i); } @@ -3415,16 +2917,16 @@ diff -NurpP --minimal linux-3.7/fs/file.c linux-3.7-vs2.3.5.1/fs/file.c + cond_resched(); } } - } -@@ -573,6 +578,7 @@ repeat: + +@@ -540,6 +545,7 @@ repeat: else __clear_close_on_exec(fd, fdt); error = fd; + vx_openfd_inc(fd); #if 1 /* Sanity check */ - if (rcu_dereference_raw(fdt->fd[fd]) != NULL) { -@@ -603,6 +609,7 @@ static void __put_unused_fd(struct files + if (rcu_access_pointer(fdt->fd[fd]) != NULL) { +@@ -570,6 +576,7 @@ static void __put_unused_fd(struct files __clear_open_fd(fd, fdt); if (fd < files->next_fd) files->next_fd = fd; @@ -3432,7 +2934,7 @@ diff -NurpP --minimal linux-3.7/fs/file.c linux-3.7-vs2.3.5.1/fs/file.c } void put_unused_fd(unsigned int fd) -@@ -882,6 +889,8 @@ static int do_dup2(struct files_struct * +@@ -857,6 +864,8 @@ __releases(&files->file_lock) if (tofree) filp_close(tofree, files); @@ -3441,20 +2943,20 @@ diff -NurpP --minimal linux-3.7/fs/file.c linux-3.7-vs2.3.5.1/fs/file.c return fd; -diff -NurpP --minimal linux-3.7/fs/file_table.c linux-3.7-vs2.3.5.1/fs/file_table.c ---- linux-3.7/fs/file_table.c 2012-12-11 15:47:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/file_table.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/file_table.c linux-4.9/fs/file_table.c +--- linux-4.9/fs/file_table.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/file_table.c 2021-02-24 15:47:45.067742158 +0100 @@ -26,6 +26,8 @@ - #include #include #include + #include +#include +#include #include -@@ -136,6 +138,8 @@ struct file *get_empty_filp(void) - spin_lock_init(&f->f_lock); +@@ -137,6 +139,8 @@ struct file *get_empty_filp(void) + mutex_init(&f->f_pos_lock); eventpoll_init_file(f); /* f->f_version: 0 */ + f->f_xid = vx_current_xid(); @@ -3462,27 +2964,27 @@ diff -NurpP --minimal linux-3.7/fs/file_table.c linux-3.7-vs2.3.5.1/fs/file_tabl return f; over: -@@ -257,6 +261,8 @@ static void __fput(struct file *file) - i_readcount_dec(inode); - if (file->f_mode & FMODE_WRITE) - drop_file_write_access(file); +@@ -219,6 +223,8 @@ static void __fput(struct file *file) + put_write_access(inode); + __mnt_drop_write(mnt); + } + vx_files_dec(file); + file->f_xid = 0; file->f_path.dentry = NULL; file->f_path.mnt = NULL; - file_free(file); -@@ -343,6 +349,8 @@ void put_filp(struct file *file) + file->f_inode = NULL; +@@ -305,6 +311,8 @@ void put_filp(struct file *file) { if (atomic_long_dec_and_test(&file->f_count)) { security_file_free(file); + vx_files_dec(file); + file->f_xid = 0; - file_sb_list_del(file); file_free(file); } -diff -NurpP --minimal linux-3.7/fs/fs_struct.c linux-3.7-vs2.3.5.1/fs/fs_struct.c ---- linux-3.7/fs/fs_struct.c 2012-10-04 13:27:39.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/fs_struct.c 2012-12-11 15:56:32.000000000 +0000 + } +diff -urNp -x '*.orig' linux-4.9/fs/fs_struct.c linux-4.9/fs/fs_struct.c +--- linux-4.9/fs/fs_struct.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/fs_struct.c 2021-02-24 15:47:45.067742158 +0100 @@ -4,6 +4,7 @@ #include #include @@ -3507,10 +3009,10 @@ diff -NurpP --minimal linux-3.7/fs/fs_struct.c linux-3.7-vs2.3.5.1/fs/fs_struct. } return fs; } -diff -NurpP --minimal linux-3.7/fs/gfs2/file.c linux-3.7-vs2.3.5.1/fs/gfs2/file.c ---- linux-3.7/fs/gfs2/file.c 2012-12-11 15:47:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/gfs2/file.c 2012-12-11 15:56:32.000000000 +0000 -@@ -143,6 +143,9 @@ static const u32 fsflags_to_gfs2[32] = { +diff -urNp -x '*.orig' linux-4.9/fs/gfs2/file.c linux-4.9/fs/gfs2/file.c +--- linux-4.9/fs/gfs2/file.c 2021-02-24 15:47:32.277342026 +0100 ++++ linux-4.9/fs/gfs2/file.c 2021-02-24 15:47:45.067742158 +0100 +@@ -137,6 +137,9 @@ static const u32 fsflags_to_gfs2[32] = { [12] = GFS2_DIF_EXHASH, [14] = GFS2_DIF_INHERIT_JDATA, [17] = GFS2_DIF_TOPDIR, @@ -3520,7 +3022,7 @@ diff -NurpP --minimal linux-3.7/fs/gfs2/file.c linux-3.7-vs2.3.5.1/fs/gfs2/file. }; static const u32 gfs2_to_fsflags[32] = { -@@ -153,6 +156,9 @@ static const u32 gfs2_to_fsflags[32] = { +@@ -147,6 +150,9 @@ static const u32 gfs2_to_fsflags[32] = { [gfs2fl_ExHash] = FS_INDEX_FL, [gfs2fl_TopLevel] = FS_TOPDIR_FL, [gfs2fl_InheritJdata] = FS_JOURNAL_DATA_FL, @@ -3530,7 +3032,7 @@ diff -NurpP --minimal linux-3.7/fs/gfs2/file.c linux-3.7-vs2.3.5.1/fs/gfs2/file. }; static int gfs2_get_flags(struct file *filp, u32 __user *ptr) -@@ -183,12 +189,18 @@ void gfs2_set_inode_flags(struct inode * +@@ -178,12 +184,17 @@ void gfs2_set_inode_flags(struct inode * { struct gfs2_inode *ip = GFS2_I(inode); unsigned int flags = inode->i_flags; @@ -3541,16 +3043,15 @@ diff -NurpP --minimal linux-3.7/fs/gfs2/file.c linux-3.7-vs2.3.5.1/fs/gfs2/file. - flags &= ~(S_SYNC|S_APPEND|S_IMMUTABLE|S_NOATIME|S_DIRSYNC|S_NOSEC); if ((ip->i_eattr == 0) && !is_sxid(inode->i_mode)) - inode->i_flags |= S_NOSEC; + flags |= S_NOSEC; if (ip->i_diskflags & GFS2_DIF_IMMUTABLE) flags |= S_IMMUTABLE; + if (ip->i_diskflags & GFS2_DIF_IXUNLINK) + flags |= S_IXUNLINK; -+ if (ip->i_diskflags & GFS2_DIF_APPENDONLY) flags |= S_APPEND; if (ip->i_diskflags & GFS2_DIF_NOATIME) -@@ -196,6 +208,43 @@ void gfs2_set_inode_flags(struct inode * +@@ -191,6 +202,43 @@ void gfs2_set_inode_flags(struct inode * if (ip->i_diskflags & GFS2_DIF_SYNC) flags |= S_SYNC; inode->i_flags = flags; @@ -3594,8 +3095,8 @@ diff -NurpP --minimal linux-3.7/fs/gfs2/file.c linux-3.7-vs2.3.5.1/fs/gfs2/file. } /* Flags that can be set by user space */ -@@ -309,6 +358,37 @@ static int gfs2_set_flags(struct file *f - return do_gfs2_set_flags(filp, gfsflags, ~GFS2_DIF_JDATA); +@@ -306,6 +354,37 @@ static int gfs2_set_flags(struct file *f + return do_gfs2_set_flags(filp, gfsflags, ~(GFS2_DIF_SYSTEM | GFS2_DIF_JDATA)); } +int gfs2_sync_flags(struct inode *inode, int flags, int vflags) @@ -3615,7 +3116,7 @@ diff -NurpP --minimal linux-3.7/fs/gfs2/file.c linux-3.7-vs2.3.5.1/fs/gfs2/file. + error = gfs2_meta_inode_buffer(ip, &bh); + if (error) + goto out_trans_end; -+ gfs2_trans_add_bh(ip->i_gl, bh, 1); ++ gfs2_trans_add_meta(ip->i_gl, bh); + inode->i_flags = flags; + inode->i_vflags = vflags; + gfs2_get_inode_flags(inode); @@ -3632,9 +3133,9 @@ diff -NurpP --minimal linux-3.7/fs/gfs2/file.c linux-3.7-vs2.3.5.1/fs/gfs2/file. static long gfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { switch(cmd) { -diff -NurpP --minimal linux-3.7/fs/gfs2/inode.h linux-3.7-vs2.3.5.1/fs/gfs2/inode.h ---- linux-3.7/fs/gfs2/inode.h 2012-07-22 21:39:40.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/gfs2/inode.h 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/gfs2/inode.h linux-4.9/fs/gfs2/inode.h +--- linux-4.9/fs/gfs2/inode.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/gfs2/inode.h 2021-02-24 15:47:45.067742158 +0100 @@ -117,6 +117,7 @@ extern const struct file_operations gfs2 extern const struct file_operations gfs2_dir_fops_nolock; @@ -3643,29 +3144,29 @@ diff -NurpP --minimal linux-3.7/fs/gfs2/inode.h linux-3.7-vs2.3.5.1/fs/gfs2/inod #ifdef CONFIG_GFS2_FS_LOCKING_DLM extern const struct file_operations gfs2_file_fops; -diff -NurpP --minimal linux-3.7/fs/hostfs/hostfs.h linux-3.7-vs2.3.5.1/fs/hostfs/hostfs.h ---- linux-3.7/fs/hostfs/hostfs.h 2012-12-11 15:47:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/hostfs/hostfs.h 2012-12-11 16:35:58.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/hostfs/hostfs.h linux-4.9/fs/hostfs/hostfs.h +--- linux-4.9/fs/hostfs/hostfs.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/hostfs/hostfs.h 2021-02-24 15:47:45.067742158 +0100 @@ -42,6 +42,7 @@ struct hostfs_iattr { unsigned short ia_mode; uid_t ia_uid; gid_t ia_gid; -+ tag_t ia_tag; ++ vtag_t ia_tag; loff_t ia_size; struct timespec ia_atime; struct timespec ia_mtime; -diff -NurpP --minimal linux-3.7/fs/inode.c linux-3.7-vs2.3.5.1/fs/inode.c ---- linux-3.7/fs/inode.c 2012-12-11 15:47:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/inode.c 2012-12-11 19:26:31.000000000 +0000 -@@ -17,6 +17,7 @@ - #include +diff -urNp -x '*.orig' linux-4.9/fs/inode.c linux-4.9/fs/inode.c +--- linux-4.9/fs/inode.c 2021-02-24 15:47:32.280675463 +0100 ++++ linux-4.9/fs/inode.c 2021-02-24 15:47:45.067742158 +0100 +@@ -18,6 +18,7 @@ #include /* for inode_has_buffers */ #include + #include +#include + #include #include "internal.h" - /* -@@ -128,6 +129,8 @@ int inode_init_always(struct super_block +@@ -133,6 +134,8 @@ int inode_init_always(struct super_block struct address_space *const mapping = &inode->i_data; inode->i_sb = sb; @@ -3673,24 +3174,24 @@ diff -NurpP --minimal linux-3.7/fs/inode.c linux-3.7-vs2.3.5.1/fs/inode.c + /* essential because of inode slab reuse */ inode->i_blkbits = sb->s_blocksize_bits; inode->i_flags = 0; - atomic_set(&inode->i_count, 1); -@@ -137,6 +140,7 @@ int inode_init_always(struct super_block - inode->i_opflags = 0; + atomic64_set(&inode->i_sequence, 0); +@@ -145,6 +148,7 @@ int inode_init_always(struct super_block + inode->i_opflags |= IOP_XATTR; i_uid_write(inode, 0); i_gid_write(inode, 0); + i_tag_write(inode, 0); atomic_set(&inode->i_writecount, 0); inode->i_size = 0; inode->i_blocks = 0; -@@ -149,6 +153,7 @@ int inode_init_always(struct super_block - inode->i_bdev = NULL; - inode->i_cdev = NULL; +@@ -156,6 +160,7 @@ int inode_init_always(struct super_block + inode->i_link = NULL; + inode->i_dir_seq = 0; inode->i_rdev = 0; + inode->i_mdev = 0; inode->dirtied_when = 0; - if (security_inode_alloc(inode)) -@@ -483,6 +488,8 @@ void __insert_inode_hash(struct inode *i + #ifdef CONFIG_CGROUP_WRITEBACK +@@ -480,6 +485,8 @@ void __insert_inode_hash(struct inode *i } EXPORT_SYMBOL(__insert_inode_hash); @@ -3699,7 +3200,7 @@ diff -NurpP --minimal linux-3.7/fs/inode.c linux-3.7-vs2.3.5.1/fs/inode.c /** * __remove_inode_hash - remove an inode from the hash * @inode: inode to unhash -@@ -1804,9 +1811,11 @@ void init_special_inode(struct inode *in +@@ -1983,9 +1990,11 @@ void init_special_inode(struct inode *in if (S_ISCHR(mode)) { inode->i_fop = &def_chr_fops; inode->i_rdev = rdev; @@ -3709,19 +3210,19 @@ diff -NurpP --minimal linux-3.7/fs/inode.c linux-3.7-vs2.3.5.1/fs/inode.c inode->i_rdev = rdev; + inode->i_mdev = rdev; } else if (S_ISFIFO(mode)) - inode->i_fop = &def_fifo_fops; + inode->i_fop = &pipefifo_fops; else if (S_ISSOCK(mode)) -@@ -1835,6 +1844,7 @@ void inode_init_owner(struct inode *inod +@@ -2020,6 +2029,7 @@ void inode_init_owner(struct inode *inod } else inode->i_gid = current_fsgid(); inode->i_mode = mode; -+ inode->i_tag = dx_current_fstag(inode->i_sb); ++ i_tag_write(inode, dx_current_fstag(inode->i_sb)); } EXPORT_SYMBOL(inode_init_owner); -diff -NurpP --minimal linux-3.7/fs/ioctl.c linux-3.7-vs2.3.5.1/fs/ioctl.c ---- linux-3.7/fs/ioctl.c 2012-12-11 15:47:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ioctl.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/ioctl.c linux-4.9/fs/ioctl.c +--- linux-4.9/fs/ioctl.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/ioctl.c 2021-02-24 15:47:45.067742158 +0100 @@ -15,6 +15,9 @@ #include #include @@ -3729,44 +3230,15 @@ diff -NurpP --minimal linux-3.7/fs/ioctl.c linux-3.7-vs2.3.5.1/fs/ioctl.c +#include +#include +#include + #include "internal.h" #include - -diff -NurpP --minimal linux-3.7/fs/ioprio.c linux-3.7-vs2.3.5.1/fs/ioprio.c ---- linux-3.7/fs/ioprio.c 2012-07-22 21:39:40.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ioprio.c 2012-12-11 15:56:32.000000000 +0000 -@@ -28,6 +28,7 @@ - #include - #include - #include -+#include - - int set_task_ioprio(struct task_struct *task, int ioprio) - { -@@ -105,6 +106,8 @@ SYSCALL_DEFINE3(ioprio_set, int, which, - else - pgrp = find_vpid(who); - do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { -+ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) -+ continue; - ret = set_task_ioprio(p, ioprio); - if (ret) - break; -@@ -198,6 +201,8 @@ SYSCALL_DEFINE2(ioprio_get, int, which, - else - pgrp = find_vpid(who); - do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { -+ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) -+ continue; - tmpio = get_task_ioprio(p); - if (tmpio < 0) - continue; -diff -NurpP --minimal linux-3.7/fs/jfs/file.c linux-3.7-vs2.3.5.1/fs/jfs/file.c ---- linux-3.7/fs/jfs/file.c 2012-12-11 15:47:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/jfs/file.c 2012-12-11 17:20:13.000000000 +0000 -@@ -109,7 +109,8 @@ int jfs_setattr(struct dentry *dentry, s - if (is_quota_modification(inode, iattr)) - dquot_initialize(inode); +diff -urNp -x '*.orig' linux-4.9/fs/jfs/file.c linux-4.9/fs/jfs/file.c +--- linux-4.9/fs/jfs/file.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/jfs/file.c 2021-02-24 15:47:45.067742158 +0100 +@@ -113,7 +113,8 @@ int jfs_setattr(struct dentry *dentry, s + return rc; + } if ((iattr->ia_valid & ATTR_UID && !uid_eq(iattr->ia_uid, inode->i_uid)) || - (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid))) { + (iattr->ia_valid & ATTR_GID && !gid_eq(iattr->ia_gid, inode->i_gid)) || @@ -3774,17 +3246,17 @@ diff -NurpP --minimal linux-3.7/fs/jfs/file.c linux-3.7-vs2.3.5.1/fs/jfs/file.c rc = dquot_transfer(inode, iattr); if (rc) return rc; -@@ -142,6 +143,7 @@ const struct inode_operations jfs_file_i - #ifdef CONFIG_JFS_POSIX_ACL +@@ -146,6 +147,7 @@ const struct inode_operations jfs_file_i .get_acl = jfs_get_acl, + .set_acl = jfs_set_acl, #endif + .sync_flags = jfs_sync_flags, }; const struct file_operations jfs_file_operations = { -diff -NurpP --minimal linux-3.7/fs/jfs/ioctl.c linux-3.7-vs2.3.5.1/fs/jfs/ioctl.c ---- linux-3.7/fs/jfs/ioctl.c 2012-12-11 15:47:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/jfs/ioctl.c 2012-12-11 17:34:44.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/jfs/ioctl.c linux-4.9/fs/jfs/ioctl.c +--- linux-4.9/fs/jfs/ioctl.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/jfs/ioctl.c 2021-02-24 15:47:45.067742158 +0100 @@ -12,6 +12,7 @@ #include #include @@ -3809,7 +3281,7 @@ diff -NurpP --minimal linux-3.7/fs/jfs/ioctl.c linux-3.7-vs2.3.5.1/fs/jfs/ioctl. + long jfs_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { - struct inode *inode = filp->f_dentry->d_inode; + struct inode *inode = file_inode(filp); @@ -89,6 +100,11 @@ long jfs_ioctl(struct file *filp, unsign if (!S_ISDIR(inode->i_mode)) flags &= ~JFS_DIRSYNC_FL; @@ -3831,7 +3303,7 @@ diff -NurpP --minimal linux-3.7/fs/jfs/ioctl.c linux-3.7-vs2.3.5.1/fs/jfs/ioctl. + ((flags ^ oldflags) & (JFS_APPEND_FL | + JFS_IMMUTABLE_FL | JFS_IXUNLINK_FL))) { if (!capable(CAP_LINUX_IMMUTABLE)) { - mutex_unlock(&inode->i_mutex); + inode_unlock(inode); err = -EPERM; @@ -115,7 +131,7 @@ long jfs_ioctl(struct file *filp, unsign } @@ -3842,9 +3314,9 @@ diff -NurpP --minimal linux-3.7/fs/jfs/ioctl.c linux-3.7-vs2.3.5.1/fs/jfs/ioctl. flags |= oldflags & ~JFS_FL_USER_MODIFIABLE; jfs_inode->mode2 = flags; -diff -NurpP --minimal linux-3.7/fs/jfs/jfs_dinode.h linux-3.7-vs2.3.5.1/fs/jfs/jfs_dinode.h ---- linux-3.7/fs/jfs/jfs_dinode.h 2008-12-24 23:26:37.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/jfs/jfs_dinode.h 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/jfs/jfs_dinode.h linux-4.9/fs/jfs/jfs_dinode.h +--- linux-4.9/fs/jfs/jfs_dinode.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/jfs/jfs_dinode.h 2021-02-24 15:47:45.067742158 +0100 @@ -161,9 +161,13 @@ struct dinode { #define JFS_APPEND_FL 0x01000000 /* writes to file may only append */ @@ -3861,9 +3333,9 @@ diff -NurpP --minimal linux-3.7/fs/jfs/jfs_dinode.h linux-3.7-vs2.3.5.1/fs/jfs/j #define JFS_FL_INHERIT 0x03C80000 /* These are identical to EXT[23]_IOC_GETFLAGS/SETFLAGS */ -diff -NurpP --minimal linux-3.7/fs/jfs/jfs_filsys.h linux-3.7-vs2.3.5.1/fs/jfs/jfs_filsys.h ---- linux-3.7/fs/jfs/jfs_filsys.h 2012-12-11 15:47:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/jfs/jfs_filsys.h 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/jfs/jfs_filsys.h linux-4.9/fs/jfs/jfs_filsys.h +--- linux-4.9/fs/jfs/jfs_filsys.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/jfs/jfs_filsys.h 2021-02-24 15:47:45.067742158 +0100 @@ -266,6 +266,7 @@ #define JFS_NAME_MAX 255 #define JFS_PATH_MAX BPSIZE @@ -3872,9 +3344,9 @@ diff -NurpP --minimal linux-3.7/fs/jfs/jfs_filsys.h linux-3.7-vs2.3.5.1/fs/jfs/j /* * file system state (superblock state) -diff -NurpP --minimal linux-3.7/fs/jfs/jfs_imap.c linux-3.7-vs2.3.5.1/fs/jfs/jfs_imap.c ---- linux-3.7/fs/jfs/jfs_imap.c 2012-12-11 15:47:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/jfs/jfs_imap.c 2012-12-11 22:02:05.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/jfs/jfs_imap.c linux-4.9/fs/jfs/jfs_imap.c +--- linux-4.9/fs/jfs/jfs_imap.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/jfs/jfs_imap.c 2021-02-24 15:47:45.071075595 +0100 @@ -46,6 +46,7 @@ #include #include @@ -3883,26 +3355,25 @@ diff -NurpP --minimal linux-3.7/fs/jfs/jfs_imap.c linux-3.7-vs2.3.5.1/fs/jfs/jfs #include "jfs_incore.h" #include "jfs_inode.h" -@@ -3058,6 +3059,8 @@ static int copy_from_dinode(struct dinod +@@ -3046,6 +3047,8 @@ static int copy_from_dinode(struct dinod { struct jfs_inode_info *jfs_ip = JFS_IP(ip); struct jfs_sb_info *sbi = JFS_SBI(ip->i_sb); -+ kuid_t uid; -+ kgid_t gid; ++ kuid_t kuid; ++ kgid_t kgid; jfs_ip->fileset = le32_to_cpu(dip->di_fileset); jfs_ip->mode2 = le32_to_cpu(dip->di_mode); -@@ -3078,14 +3081,19 @@ static int copy_from_dinode(struct dinod +@@ -3066,14 +3069,18 @@ static int copy_from_dinode(struct dinod } set_nlink(ip, le32_to_cpu(dip->di_nlink)); - jfs_ip->saved_uid = make_kuid(&init_user_ns, le32_to_cpu(dip->di_uid)); -+ uid = make_kuid(&init_user_ns, le32_to_cpu(dip->di_uid)); -+ gid = make_kgid(&init_user_ns, le32_to_cpu(dip->di_gid)); -+ ip->i_tag = make_ktag(&init_user_ns, -+ INOTAG_TAG(DX_TAG(ip), uid, gid, 0)); ++ kuid = make_kuid(&init_user_ns, le32_to_cpu(dip->di_uid)); ++ kgid = make_kgid(&init_user_ns, le32_to_cpu(dip->di_gid)); ++ ip->i_tag = INOTAG_KTAG(DX_TAG(ip), kuid, kgid, GLOBAL_ROOT_TAG); + -+ jfs_ip->saved_uid = INOTAG_UID(DX_TAG(ip), uid, gid); ++ jfs_ip->saved_uid = INOTAG_KUID(DX_TAG(ip), kuid, kgid); if (!uid_valid(sbi->uid)) ip->i_uid = jfs_ip->saved_uid; else { @@ -3910,11 +3381,11 @@ diff -NurpP --minimal linux-3.7/fs/jfs/jfs_imap.c linux-3.7-vs2.3.5.1/fs/jfs/jfs } - jfs_ip->saved_gid = make_kgid(&init_user_ns, le32_to_cpu(dip->di_gid)); -+ jfs_ip->saved_gid = INOTAG_GID(DX_TAG(ip), uid, gid); ++ jfs_ip->saved_gid = INOTAG_KGID(DX_TAG(ip), kuid, kgid); if (!gid_valid(sbi->gid)) ip->i_gid = jfs_ip->saved_gid; else { -@@ -3150,16 +3158,14 @@ static void copy_to_dinode(struct dinode +@@ -3138,16 +3145,14 @@ static void copy_to_dinode(struct dinode dip->di_size = cpu_to_le64(ip->i_size); dip->di_nblocks = cpu_to_le64(PBLK2LBLK(ip->i_sb, ip->i_blocks)); dip->di_nlink = cpu_to_le32(ip->i_nlink); @@ -3929,19 +3400,19 @@ diff -NurpP --minimal linux-3.7/fs/jfs/jfs_imap.c linux-3.7-vs2.3.5.1/fs/jfs/jfs - dip->di_gid = cpu_to_le32(from_kgid(&init_user_ns, - jfs_ip->saved_gid)); + dip->di_uid = cpu_to_le32(from_kuid(&init_user_ns, -+ TAGINO_UID(DX_TAG(ip), ++ TAGINO_KUID(DX_TAG(ip), + !uid_valid(sbi->uid) ? ip->i_uid : jfs_ip->saved_uid, + ip->i_tag))); -+ dip->di_gid = cpu_to_le32(from_kuid(&init_user_ns, -+ TAGINO_GID(DX_TAG(ip), ++ dip->di_gid = cpu_to_le32(from_kgid(&init_user_ns, ++ TAGINO_KGID(DX_TAG(ip), + !gid_valid(sbi->gid) ? ip->i_gid : jfs_ip->saved_gid, + ip->i_tag))); jfs_get_inode_flags(jfs_ip); /* * mode2 is only needed for storing the higher order bits. -diff -NurpP --minimal linux-3.7/fs/jfs/jfs_inode.c linux-3.7-vs2.3.5.1/fs/jfs/jfs_inode.c ---- linux-3.7/fs/jfs/jfs_inode.c 2012-01-09 15:14:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/jfs/jfs_inode.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/jfs/jfs_inode.c linux-4.9/fs/jfs/jfs_inode.c +--- linux-4.9/fs/jfs/jfs_inode.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/jfs/jfs_inode.c 2021-02-24 15:47:45.071075595 +0100 @@ -18,6 +18,7 @@ #include @@ -3950,37 +3421,34 @@ diff -NurpP --minimal linux-3.7/fs/jfs/jfs_inode.c linux-3.7-vs2.3.5.1/fs/jfs/jf #include "jfs_incore.h" #include "jfs_inode.h" #include "jfs_filsys.h" -@@ -30,29 +31,46 @@ void jfs_set_inode_flags(struct inode *i - { - unsigned int flags = JFS_IP(inode)->mode2; - -- inode->i_flags &= ~(S_IMMUTABLE | S_APPEND | -- S_NOATIME | S_DIRSYNC | S_SYNC); -+ inode->i_flags &= ~(S_IMMUTABLE | S_IXUNLINK | -+ S_SYNC | S_APPEND | S_NOATIME | S_DIRSYNC); +@@ -33,6 +34,9 @@ void jfs_set_inode_flags(struct inode *i if (flags & JFS_IMMUTABLE_FL) - inode->i_flags |= S_IMMUTABLE; + new_fl |= S_IMMUTABLE; + if (flags & JFS_IXUNLINK_FL) -+ inode->i_flags |= S_IXUNLINK; ++ new_fl |= S_IXUNLINK; + -+ if (flags & JFS_SYNC_FL) -+ inode->i_flags |= S_SYNC; if (flags & JFS_APPEND_FL) - inode->i_flags |= S_APPEND; + new_fl |= S_APPEND; if (flags & JFS_NOATIME_FL) - inode->i_flags |= S_NOATIME; - if (flags & JFS_DIRSYNC_FL) - inode->i_flags |= S_DIRSYNC; -- if (flags & JFS_SYNC_FL) -- inode->i_flags |= S_SYNC; +@@ -41,18 +45,35 @@ void jfs_set_inode_flags(struct inode *i + new_fl |= S_DIRSYNC; + if (flags & JFS_SYNC_FL) + new_fl |= S_SYNC; +- inode_set_flags(inode, new_fl, S_IMMUTABLE | S_APPEND | S_NOATIME | +- S_DIRSYNC | S_SYNC); + -+ inode->i_vflags &= ~(V_BARRIER | V_COW); ++ inode_set_flags(inode, new_fl, S_IMMUTABLE | S_IXUNLINK | ++ S_APPEND | S_NOATIME | S_DIRSYNC | S_SYNC); + ++ new_fl = 0; + if (flags & JFS_BARRIER_FL) -+ inode->i_vflags |= V_BARRIER; ++ new_fl |= V_BARRIER; + if (flags & JFS_COW_FL) -+ inode->i_vflags |= V_COW; ++ new_fl |= V_COW; ++ ++ set_mask_bits(&inode->i_vflags, ++ V_BARRIER | V_COW, new_fl); } void jfs_get_inode_flags(struct jfs_inode_info *jfs_ip) @@ -4003,7 +3471,7 @@ diff -NurpP --minimal linux-3.7/fs/jfs/jfs_inode.c linux-3.7-vs2.3.5.1/fs/jfs/jf if (flags & S_APPEND) jfs_ip->mode2 |= JFS_APPEND_FL; if (flags & S_NOATIME) -@@ -61,6 +79,11 @@ void jfs_get_inode_flags(struct jfs_inod +@@ -61,6 +82,11 @@ void jfs_get_inode_flags(struct jfs_inod jfs_ip->mode2 |= JFS_DIRSYNC_FL; if (flags & S_SYNC) jfs_ip->mode2 |= JFS_SYNC_FL; @@ -4015,9 +3483,9 @@ diff -NurpP --minimal linux-3.7/fs/jfs/jfs_inode.c linux-3.7-vs2.3.5.1/fs/jfs/jf } /* -diff -NurpP --minimal linux-3.7/fs/jfs/jfs_inode.h linux-3.7-vs2.3.5.1/fs/jfs/jfs_inode.h ---- linux-3.7/fs/jfs/jfs_inode.h 2011-10-24 16:45:27.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/jfs/jfs_inode.h 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/jfs/jfs_inode.h linux-4.9/fs/jfs/jfs_inode.h +--- linux-4.9/fs/jfs/jfs_inode.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/jfs/jfs_inode.h 2021-02-24 15:47:45.071075595 +0100 @@ -39,6 +39,7 @@ extern struct dentry *jfs_fh_to_dentry(s extern struct dentry *jfs_fh_to_parent(struct super_block *sb, struct fid *fid, int fh_len, int fh_type); @@ -4026,9 +3494,9 @@ diff -NurpP --minimal linux-3.7/fs/jfs/jfs_inode.h linux-3.7-vs2.3.5.1/fs/jfs/jf extern int jfs_get_block(struct inode *, sector_t, struct buffer_head *, int); extern int jfs_setattr(struct dentry *, struct iattr *); -diff -NurpP --minimal linux-3.7/fs/jfs/namei.c linux-3.7-vs2.3.5.1/fs/jfs/namei.c ---- linux-3.7/fs/jfs/namei.c 2012-10-04 13:27:40.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/jfs/namei.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/jfs/namei.c linux-4.9/fs/jfs/namei.c +--- linux-4.9/fs/jfs/namei.c 2021-02-24 15:47:32.287342339 +0100 ++++ linux-4.9/fs/jfs/namei.c 2021-02-24 15:47:45.071075595 +0100 @@ -22,6 +22,7 @@ #include #include @@ -4037,7 +3505,7 @@ diff -NurpP --minimal linux-3.7/fs/jfs/namei.c linux-3.7-vs2.3.5.1/fs/jfs/namei. #include "jfs_incore.h" #include "jfs_superblock.h" #include "jfs_inode.h" -@@ -1461,6 +1462,7 @@ static struct dentry *jfs_lookup(struct +@@ -1480,6 +1481,7 @@ static struct dentry *jfs_lookup(struct jfs_err("jfs_lookup: iget failed on inum %d", (uint)inum); } @@ -4045,18 +3513,18 @@ diff -NurpP --minimal linux-3.7/fs/jfs/namei.c linux-3.7-vs2.3.5.1/fs/jfs/namei. return d_splice_alias(ip, dentry); } -@@ -1525,6 +1527,7 @@ const struct inode_operations jfs_dir_in - #ifdef CONFIG_JFS_POSIX_ACL +@@ -1542,6 +1544,7 @@ const struct inode_operations jfs_dir_in .get_acl = jfs_get_acl, + .set_acl = jfs_set_acl, #endif + .sync_flags = jfs_sync_flags, }; const struct file_operations jfs_dir_operations = { -diff -NurpP --minimal linux-3.7/fs/jfs/super.c linux-3.7-vs2.3.5.1/fs/jfs/super.c ---- linux-3.7/fs/jfs/super.c 2012-12-11 15:47:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/jfs/super.c 2012-12-11 17:36:00.000000000 +0000 -@@ -199,7 +199,8 @@ enum { +diff -urNp -x '*.orig' linux-4.9/fs/jfs/super.c linux-4.9/fs/jfs/super.c +--- linux-4.9/fs/jfs/super.c 2021-02-24 15:47:32.287342339 +0100 ++++ linux-4.9/fs/jfs/super.c 2021-02-24 15:47:45.071075595 +0100 +@@ -206,7 +206,8 @@ enum { Opt_integrity, Opt_nointegrity, Opt_iocharset, Opt_resize, Opt_resize_nosize, Opt_errors, Opt_ignore, Opt_err, Opt_quota, Opt_usrquota, Opt_grpquota, Opt_uid, Opt_gid, Opt_umask, @@ -4066,7 +3534,7 @@ diff -NurpP --minimal linux-3.7/fs/jfs/super.c linux-3.7-vs2.3.5.1/fs/jfs/super. }; static const match_table_t tokens = { -@@ -209,6 +210,10 @@ static const match_table_t tokens = { +@@ -216,6 +217,10 @@ static const match_table_t tokens = { {Opt_resize, "resize=%u"}, {Opt_resize_nosize, "resize"}, {Opt_errors, "errors=%s"}, @@ -4077,8 +3545,8 @@ diff -NurpP --minimal linux-3.7/fs/jfs/super.c linux-3.7-vs2.3.5.1/fs/jfs/super. {Opt_ignore, "noquota"}, {Opt_ignore, "quota"}, {Opt_usrquota, "usrquota"}, -@@ -385,7 +390,20 @@ static int parse_options(char *options, - } +@@ -405,7 +410,20 @@ static int parse_options(char *options, + pr_err("JFS: discard option not supported on device\n"); break; } - @@ -4097,11 +3565,11 @@ diff -NurpP --minimal linux-3.7/fs/jfs/super.c linux-3.7-vs2.3.5.1/fs/jfs/super. + break; +#endif default: - printk("jfs: Unrecognized mount option \"%s\" " - " or missing value\n", p); -@@ -417,6 +435,12 @@ static int jfs_remount(struct super_bloc + printk("jfs: Unrecognized mount option \"%s\" or missing value\n", + p); +@@ -437,6 +455,12 @@ static int jfs_remount(struct super_bloc + if (!parse_options(data, sb, &newLVSize, &flag)) return -EINVAL; - } + if ((flag & JFS_TAGGED) && !(sb->s_flags & MS_TAGGED)) { + printk(KERN_ERR "JFS: %s: tagging not permitted on remount.\n", @@ -4111,8 +3579,8 @@ diff -NurpP --minimal linux-3.7/fs/jfs/super.c linux-3.7-vs2.3.5.1/fs/jfs/super. + if (newLVSize) { if (sb->s_flags & MS_RDONLY) { - pr_err("JFS: resize requires volume" \ -@@ -502,6 +526,9 @@ static int jfs_fill_super(struct super_b + pr_err("JFS: resize requires volume to be mounted read-write\n"); +@@ -517,6 +541,9 @@ static int jfs_fill_super(struct super_b #ifdef CONFIG_JFS_POSIX_ACL sb->s_flags |= MS_POSIXACL; #endif @@ -4122,67 +3590,68 @@ diff -NurpP --minimal linux-3.7/fs/jfs/super.c linux-3.7-vs2.3.5.1/fs/jfs/super. if (newLVSize) { pr_err("resize option for remount only\n"); -diff -NurpP --minimal linux-3.7/fs/libfs.c linux-3.7-vs2.3.5.1/fs/libfs.c ---- linux-3.7/fs/libfs.c 2012-12-11 15:47:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/libfs.c 2012-12-11 15:56:32.000000000 +0000 -@@ -135,7 +135,8 @@ static inline unsigned char dt_type(stru +diff -urNp -x '*.orig' linux-4.9/fs/libfs.c linux-4.9/fs/libfs.c +--- linux-4.9/fs/libfs.c 2021-02-24 15:47:32.287342339 +0100 ++++ linux-4.9/fs/libfs.c 2021-02-24 15:47:45.071075595 +0100 +@@ -180,7 +180,8 @@ static inline unsigned char dt_type(stru * both impossible due to the lock on directory. */ --int dcache_readdir(struct file * filp, void * dirent, filldir_t filldir) -+static inline int do_dcache_readdir_filter(struct file *filp, -+ void *dirent, filldir_t filldir, int (*filter)(struct dentry *dentry)) +-int dcache_readdir(struct file *file, struct dir_context *ctx) ++static inline int do_dcache_readdir_filter(struct file *file, ++ struct dir_context *ctx, int (*filter)(struct dentry *dentry)) { - struct dentry *dentry = filp->f_path.dentry; - struct dentry *cursor = filp->private_data; -@@ -166,6 +167,8 @@ int dcache_readdir(struct file * filp, v - for (p=q->next; p != &dentry->d_subdirs; p=p->next) { - struct dentry *next; - next = list_entry(p, struct dentry, d_u.d_child); -+ if (filter && !filter(next)) -+ continue; - spin_lock_nested(&next->d_lock, DENTRY_D_LOCK_NESTED); - if (!simple_positive(next)) { - spin_unlock(&next->d_lock); -@@ -192,6 +195,17 @@ int dcache_readdir(struct file * filp, v + struct dentry *dentry = file->f_path.dentry; + struct dentry *cursor = file->private_data; +@@ -197,9 +198,10 @@ int dcache_readdir(struct file *file, st + p = &cursor->d_child; + + while ((p = scan_positives(cursor, p, 1, &next)) != anchor) { +- if (!dir_emit(ctx, next->d_name.name, next->d_name.len, ++ if (!filter || filter(next)) ++ if (!dir_emit(ctx, next->d_name.name, next->d_name.len, + d_inode(next)->i_ino, dt_type(d_inode(next)))) +- break; ++ break; + ctx->pos++; + } + spin_lock(&dentry->d_lock); +@@ -209,8 +211,22 @@ int dcache_readdir(struct file *file, st + return 0; } ++ + EXPORT_SYMBOL(dcache_readdir); -+int dcache_readdir(struct file *filp, void *dirent, filldir_t filldir) ++int dcache_readdir(struct file *filp, struct dir_context *ctx) +{ -+ return do_dcache_readdir_filter(filp, dirent, filldir, NULL); ++ return do_dcache_readdir_filter(filp, ctx, NULL); +} + -+int dcache_readdir_filter(struct file *filp, void *dirent, filldir_t filldir, ++EXPORT_SYMBOL(dcache_readdir_filter); ++ ++int dcache_readdir_filter(struct file *filp, struct dir_context *ctx, + int (*filter)(struct dentry *)) +{ -+ return do_dcache_readdir_filter(filp, dirent, filldir, filter); ++ return do_dcache_readdir_filter(filp, ctx, filter); +} + ssize_t generic_read_dir(struct file *filp, char __user *buf, size_t siz, loff_t *ppos) { return -EISDIR; -@@ -983,6 +997,7 @@ EXPORT_SYMBOL(dcache_dir_close); - EXPORT_SYMBOL(dcache_dir_lseek); - EXPORT_SYMBOL(dcache_dir_open); - EXPORT_SYMBOL(dcache_readdir); -+EXPORT_SYMBOL(dcache_readdir_filter); - EXPORT_SYMBOL(generic_read_dir); - EXPORT_SYMBOL(mount_pseudo); - EXPORT_SYMBOL(simple_write_begin); -diff -NurpP --minimal linux-3.7/fs/locks.c linux-3.7-vs2.3.5.1/fs/locks.c ---- linux-3.7/fs/locks.c 2012-12-11 15:47:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/locks.c 2012-12-11 15:56:32.000000000 +0000 -@@ -126,6 +126,8 @@ - #include - #include +diff -urNp -x '*.orig' linux-4.9/fs/locks.c linux-4.9/fs/locks.c +--- linux-4.9/fs/locks.c 2021-02-24 15:47:32.287342339 +0100 ++++ linux-4.9/fs/locks.c 2021-02-24 15:47:45.071075595 +0100 +@@ -127,6 +127,8 @@ #include + #include + #include +#include +#include - #include - -@@ -184,11 +186,17 @@ static void locks_init_lock_heads(struct + #define CREATE_TRACE_POINTS + #include +@@ -292,11 +294,15 @@ static void locks_init_lock_heads(struct /* Allocate an empty lock structure. */ struct file_lock *locks_alloc_lock(void) { @@ -4191,27 +3660,17 @@ diff -NurpP --minimal linux-3.7/fs/locks.c linux-3.7-vs2.3.5.1/fs/locks.c - if (fl) - locks_init_lock_heads(fl); -+ if (!vx_locks_avail(1)) -+ return NULL; - + fl = kmem_cache_zalloc(filelock_cache, GFP_KERNEL); -+ + + if (fl) { + locks_init_lock_heads(fl); ++ vx_locks_inc(fl); + fl->fl_xid = -1; + } return fl; } EXPORT_SYMBOL_GPL(locks_alloc_lock); -@@ -212,6 +220,7 @@ void locks_free_lock(struct file_lock *f - BUG_ON(!list_empty(&fl->fl_block)); - BUG_ON(!list_empty(&fl->fl_link)); - -+ vx_locks_dec(fl); - locks_release_private(fl); - kmem_cache_free(filelock_cache, fl); - } -@@ -221,6 +230,7 @@ void locks_init_lock(struct file_lock *f +@@ -348,6 +354,7 @@ void locks_init_lock(struct file_lock *f { memset(fl, 0, sizeof(struct file_lock)); locks_init_lock_heads(fl); @@ -4219,35 +3678,35 @@ diff -NurpP --minimal linux-3.7/fs/locks.c linux-3.7-vs2.3.5.1/fs/locks.c } EXPORT_SYMBOL(locks_init_lock); -@@ -261,6 +271,7 @@ void locks_copy_lock(struct file_lock *n - new->fl_file = fl->fl_file; - new->fl_ops = fl->fl_ops; +@@ -365,6 +372,7 @@ void locks_copy_conflock(struct file_loc + new->fl_start = fl->fl_start; + new->fl_end = fl->fl_end; new->fl_lmops = fl->fl_lmops; + new->fl_xid = fl->fl_xid; + new->fl_ops = NULL; - locks_copy_private(new, fl); - } -@@ -299,6 +310,11 @@ static int flock_make_lock(struct file * + if (fl->fl_lmops) { +@@ -426,7 +434,10 @@ flock_make_lock(struct file *filp, unsig fl->fl_flags = FL_FLOCK; fl->fl_type = type; fl->fl_end = OFFSET_MAX; +- + + vxd_assert(filp->f_xid == vx_current_xid(), + "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid()); + fl->fl_xid = filp->f_xid; -+ vx_locks_inc(fl); - - *lock = fl; - return 0; -@@ -438,6 +454,7 @@ static int lease_init(struct file *filp, + return fl; + } - fl->fl_owner = current->files; +@@ -548,6 +559,7 @@ static int lease_init(struct file *filp, + + fl->fl_owner = filp; fl->fl_pid = current->tgid; + fl->fl_xid = vx_current_xid(); fl->fl_file = filp; fl->fl_flags = FL_LEASE; -@@ -457,6 +474,11 @@ static struct file_lock *lease_alloc(str +@@ -567,6 +579,10 @@ static struct file_lock *lease_alloc(str if (fl == NULL) return ERR_PTR(error); @@ -4255,140 +3714,140 @@ diff -NurpP --minimal linux-3.7/fs/locks.c linux-3.7-vs2.3.5.1/fs/locks.c + if (filp) + vxd_assert(filp->f_xid == fl->fl_xid, + "f_xid(%d) == fl_xid(%d)", filp->f_xid, fl->fl_xid); -+ vx_locks_inc(fl); error = lease_init(filp, type, fl); if (error) { locks_free_lock(fl); -@@ -753,6 +775,7 @@ static int flock_lock_file(struct file * - lock_flocks(); +@@ -956,6 +972,7 @@ static int flock_lock_inode(struct inode + goto out; } + new_fl->fl_xid = -1; find_conflict: - for_each_lock(inode, before) { - struct file_lock *fl = *before; -@@ -773,6 +796,7 @@ find_conflict: - goto out; - locks_copy_lock(new_fl, request); - locks_insert_lock(before, new_fl); -+ vx_locks_inc(new_fl); - new_fl = NULL; - error = 0; - -@@ -783,7 +807,8 @@ out: - return error; + list_for_each_entry(fl, &ctx->flc_flock, fl_list) { + if (!flock_locks_conflict(request, fl)) +@@ -984,7 +1001,7 @@ out: } --static int __posix_lock_file(struct inode *inode, struct file_lock *request, struct file_lock *conflock) -+static int __posix_lock_file(struct inode *inode, struct file_lock *request, -+ struct file_lock *conflock, xid_t xid) + static int posix_lock_inode(struct inode *inode, struct file_lock *request, +- struct file_lock *conflock) ++ struct file_lock *conflock, vxid_t xid) { - struct file_lock *fl; + struct file_lock *fl, *tmp; struct file_lock *new_fl = NULL; -@@ -793,6 +818,8 @@ static int __posix_lock_file(struct inod - struct file_lock **before; - int error, added = 0; +@@ -1000,6 +1017,9 @@ static int posix_lock_inode(struct inode + if (!ctx) + return (request->fl_type == F_UNLCK) ? 0 : -ENOMEM; -+ vxd_assert(xid == vx_current_xid(), -+ "xid(%d) == current(%d)", xid, vx_current_xid()); ++ if (xid) ++ vxd_assert(xid == vx_current_xid(), ++ "xid(%d) == current(%d)", xid, vx_current_xid()); /* * We may need two file_lock structures for this operation, * so we get them in advance to avoid races. -@@ -803,7 +830,11 @@ static int __posix_lock_file(struct inod +@@ -1010,7 +1030,11 @@ static int posix_lock_inode(struct inode (request->fl_type != F_UNLCK || request->fl_start != 0 || request->fl_end != OFFSET_MAX)) { new_fl = locks_alloc_lock(); + new_fl->fl_xid = xid; -+ vx_locks_inc(new_fl); ++ // vx_locks_inc(new_fl); new_fl2 = locks_alloc_lock(); + new_fl2->fl_xid = xid; -+ vx_locks_inc(new_fl2); ++ // vx_locks_inc(new_fl2); } - lock_flocks(); -@@ -1002,7 +1033,8 @@ static int __posix_lock_file(struct inod + percpu_down_read_preempt_disable(&file_rwsem); +@@ -1216,7 +1240,7 @@ static int posix_lock_inode(struct inode int posix_lock_file(struct file *filp, struct file_lock *fl, struct file_lock *conflock) { -- return __posix_lock_file(filp->f_path.dentry->d_inode, fl, conflock); -+ return __posix_lock_file(filp->f_path.dentry->d_inode, -+ fl, conflock, filp->f_xid); +- return posix_lock_inode(locks_inode(filp), fl, conflock); ++ return posix_lock_inode(locks_inode(filp), fl, conflock, filp->f_xid); } EXPORT_SYMBOL(posix_lock_file); -@@ -1092,7 +1124,7 @@ int locks_mandatory_area(int read_write, - fl.fl_end = offset + count - 1; +@@ -1232,7 +1256,7 @@ static int posix_lock_inode_wait(struct + int error; + might_sleep (); + for (;;) { +- error = posix_lock_inode(inode, fl, NULL); ++ error = posix_lock_inode(inode, fl, NULL, 0); + if (error != FILE_LOCK_DEFERRED) + break; + error = wait_event_interruptible(fl->fl_wait, !fl->fl_next); +@@ -1308,10 +1332,13 @@ int locks_mandatory_area(struct inode *i + fl.fl_end = end; for (;;) { -- error = __posix_lock_file(inode, &fl, NULL); -+ error = __posix_lock_file(inode, &fl, NULL, filp->f_xid); ++ vxid_t f_xid = 0; ++ + if (filp) { + fl.fl_owner = filp; + fl.fl_flags &= ~FL_SLEEP; +- error = posix_lock_inode(inode, &fl, NULL); ++ f_xid = filp->f_xid; ++ error = posix_lock_inode(inode, &fl, NULL, f_xid); + if (!error) + break; + } +@@ -1319,7 +1346,7 @@ int locks_mandatory_area(struct inode *i + if (sleep) + fl.fl_flags |= FL_SLEEP; + fl.fl_owner = current->files; +- error = posix_lock_inode(inode, &fl, NULL); ++ error = posix_lock_inode(inode, &fl, NULL, f_xid); if (error != FILE_LOCK_DEFERRED) break; error = wait_event_interruptible(fl.fl_wait, !fl.fl_next); -@@ -1397,6 +1429,7 @@ int generic_add_lease(struct file *filp, - goto out; - - locks_insert_lock(before, lease); -+ vx_locks_inc(lease); - return 0; - - out: -@@ -1836,6 +1869,11 @@ int fcntl_setlk(unsigned int fd, struct +@@ -2374,6 +2401,16 @@ int fcntl_setlk64(unsigned int fd, struc if (file_lock == NULL) return -ENOLCK; + vxd_assert(filp->f_xid == vx_current_xid(), + "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid()); + file_lock->fl_xid = filp->f_xid; -+ vx_locks_inc(file_lock); ++ // vx_locks_inc(file_lock); + - /* - * This might block, so we do it before checking the inode. - */ -@@ -1954,6 +1992,11 @@ int fcntl_setlk64(unsigned int fd, struc - if (file_lock == NULL) - return -ENOLCK; - + vxd_assert(filp->f_xid == vx_current_xid(), + "f_xid(%d) == current(%d)", filp->f_xid, vx_current_xid()); + file_lock->fl_xid = filp->f_xid; -+ vx_locks_inc(file_lock); ++ // vx_locks_inc(file_lock); + /* * This might block, so we do it before checking the inode. */ -@@ -2219,8 +2262,11 @@ static int locks_show(struct seq_file *f +@@ -2710,8 +2747,11 @@ static int locks_show(struct seq_file *f - lock_get_status(f, fl, *((loff_t *)f->private), ""); + lock_get_status(f, fl, iter->li_pos, ""); - list_for_each_entry(bfl, &fl->fl_block, fl_block) + list_for_each_entry(bfl, &fl->fl_block, fl_block) { + if (!vx_check(fl->fl_xid, VS_WATCH_P | VS_IDENT)) + continue; - lock_get_status(f, bfl, *((loff_t *)f->private), " ->"); + lock_get_status(f, bfl, iter->li_pos, " ->"); + } return 0; } -diff -NurpP --minimal linux-3.7/fs/mount.h linux-3.7-vs2.3.5.1/fs/mount.h ---- linux-3.7/fs/mount.h 2012-10-04 13:27:40.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/mount.h 2012-12-11 15:56:32.000000000 +0000 -@@ -46,6 +46,7 @@ struct mount { - int mnt_expiry_mark; /* true if marked for expiry */ - int mnt_pinned; - int mnt_ghosts; -+ tag_t mnt_tag; /* tagging used for vfsmount */ +diff -urNp -x '*.orig' linux-4.9/fs/mount.h linux-4.9/fs/mount.h +--- linux-4.9/fs/mount.h 2021-02-24 15:47:32.287342339 +0100 ++++ linux-4.9/fs/mount.h 2021-02-24 15:47:45.071075595 +0100 +@@ -69,6 +69,7 @@ struct mount { + struct hlist_head mnt_pins; + struct fs_pin mnt_umount; + struct dentry *mnt_ex_mountpoint; ++ vtag_t mnt_tag; /* tagging used for vfsmount */ }; #define MNT_NS_INTERNAL ERR_PTR(-EINVAL) /* distinct from any mnt_namespace */ -diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c ---- linux-3.7/fs/namei.c 2012-12-11 15:47:35.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/namei.c 2012-12-11 21:44:51.000000000 +0000 -@@ -34,6 +34,14 @@ - #include - #include - #include +diff -urNp -x '*.orig' linux-4.9/fs/namei.c linux-4.9/fs/namei.c +--- linux-4.9/fs/namei.c 2021-02-24 15:47:32.290675776 +0100 ++++ linux-4.9/fs/namei.c 2021-02-24 15:47:45.071075595 +0100 +@@ -37,9 +37,19 @@ + #include + #include + #include +#include ++#include +#include +#include +#include @@ -4399,7 +3858,11 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c #include #include "internal.h" -@@ -266,6 +274,89 @@ static int check_acl(struct inode *inode ++#include "proc/internal.h" + #include "mount.h" + + /* [Feb-1997 T. Schoebel-Theuer] +@@ -286,6 +296,93 @@ static int check_acl(struct inode *inode return -EAGAIN; } @@ -4420,7 +3883,7 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + if (inode->i_sb->s_magic == DEVPTS_SUPER_MAGIC) { + /* devpts is xid tagged */ + if (S_ISDIR(inode->i_mode) || -+ vx_check((xid_t)i_tag_read(inode), VS_IDENT | VS_WATCH_P)) ++ vx_check((vxid_t)i_tag_read(inode), VS_IDENT | VS_WATCH_P)) + return 0; + + /* just pretend we didn't find anything */ @@ -4429,8 +3892,12 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + else if (inode->i_sb->s_magic == PROC_SUPER_MAGIC) { + struct proc_dir_entry *de = PDE(inode); + -+ if (de && !vx_hide_check(0, de->vx_flags)) ++ if (de && !vx_hide_check(0, de->vx_flags)) { ++ vxdprintk(VXD_CBIT(misc, 9), ++ VS_Q("%*s") " hidden by _dx_permission", ++ de->namelen, de->name); + goto out; ++ } + + if ((mask & (MAY_WRITE | MAY_APPEND))) { + struct pid *pid; @@ -4462,7 +3929,7 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + } + else { + if (dx_notagcheck(inode->i_sb) || -+ dx_check((xid_t)i_tag_read(inode), ++ dx_check((vxid_t)i_tag_read(inode), + DX_HOSTID | DX_ADMIN | DX_WATCH | DX_IDENT)) + return 0; + } @@ -4480,8 +3947,8 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c +#endif + vxwprintk_task(1, + "denied [0x%x] access to inode %s:%p[#%d,%lu]", -+ mask, inode->i_sb->s_id, inode, inode->i_tag, -+ inode->i_ino); ++ mask, inode->i_sb->s_id, inode, ++ i_tag_read(inode), inode->i_ino); + } + return ret; +} @@ -4489,12 +3956,16 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c /* * This does the basic permission checking */ -@@ -388,10 +479,14 @@ int __inode_permission(struct inode *ino +@@ -410,7 +507,7 @@ int __inode_permission(struct inode *ino /* * Nobody gets write access to an immutable file. */ - if (IS_IMMUTABLE(inode)) + if (IS_IMMUTABLE(inode) && !IS_COW(inode)) + return -EPERM; + + /* +@@ -422,6 +519,10 @@ int __inode_permission(struct inode *ino return -EACCES; } @@ -4505,45 +3976,16 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c retval = do_inode_permission(inode, mask); if (retval) return retval; -@@ -1244,7 +1339,8 @@ static void follow_dotdot(struct nameida - - if (nd->path.dentry == nd->root.dentry && - nd->path.mnt == nd->root.mnt) { -- break; -+ /* for sane '/' avoid follow_mount() */ -+ return; - } - if (nd->path.dentry != nd->path.mnt->mnt_root) { - /* rare case of legitimate dget_parent()... */ -@@ -1393,6 +1489,9 @@ static int lookup_fast(struct nameidata - goto unlazy; - } - } -+ -+ /* FIXME: check dx permission */ -+ - path->mnt = mnt; - path->dentry = dentry; - if (unlikely(!__follow_mount_rcu(nd, path, inode))) -@@ -1428,6 +1527,8 @@ unlazy: - } - } - -+ /* FIXME: check dx permission */ -+ - path->mnt = mnt; - path->dentry = dentry; - err = follow_managed(path, nd->flags); -@@ -2258,7 +2359,7 @@ static int may_delete(struct inode *dir, - if (IS_APPEND(dir)) +@@ -2825,7 +2926,7 @@ static int may_delete(struct inode *dir, return -EPERM; - if (check_sticky(dir, victim->d_inode)||IS_APPEND(victim->d_inode)|| -- IS_IMMUTABLE(victim->d_inode) || IS_SWAPFILE(victim->d_inode)) -+ IS_IXORUNLINK(victim->d_inode) || IS_SWAPFILE(victim->d_inode)) + + if (check_sticky(dir, inode) || IS_APPEND(inode) || +- IS_IMMUTABLE(inode) || IS_SWAPFILE(inode) || HAS_UNMAPPED_ID(inode)) ++ IS_IXORUNLINK(inode) || IS_SWAPFILE(inode) || HAS_UNMAPPED_ID(inode)) return -EPERM; if (isdir) { - if (!S_ISDIR(victim->d_inode->i_mode)) -@@ -2337,19 +2438,25 @@ int vfs_create(struct inode *dir, struct + if (!d_is_dir(victim)) +@@ -2913,19 +3014,25 @@ int vfs_create(struct inode *dir, struct bool want_excl) { int error = may_create(dir, dentry); @@ -4570,8 +4012,8 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + vxdprintk(VXD_CBIT(misc, 3), "i_op->create failed with %d", error); return error; } - -@@ -2384,6 +2491,15 @@ static int may_open(struct path *path, i + EXPORT_SYMBOL(vfs_create); +@@ -2963,6 +3070,15 @@ static int may_open(struct path *path, i break; } @@ -4584,17 +4026,17 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + mark_inode_dirty(inode); + } +#endif - error = inode_permission(inode, acc_mode); + error = inode_permission(inode, MAY_OPEN | acc_mode); if (error) return error; -@@ -2886,6 +3002,16 @@ finish_open: +@@ -3423,6 +3539,16 @@ finish_open: } finish_open_created: error = may_open(&nd->path, acc_mode, open_flag); +#ifdef CONFIG_VSERVER_COWBL + if (error == -EMLINK) { + struct dentry *dentry; -+ dentry = cow_break_link(name->name); ++ dentry = cow_break_link(nd->name->name); + if (IS_ERR(dentry)) + error = PTR_ERR(dentry); + else @@ -4603,37 +4045,35 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c +#endif if (error) goto out; - file->f_path.mnt = nd->path.mnt; -@@ -2950,6 +3076,7 @@ static struct file *path_openat(int dfd, + BUG_ON(*opened & FILE_OPENED); /* once it's opened, it's opened */ +@@ -3526,6 +3652,9 @@ static struct file *path_openat(struct n int opened = 0; int error; ++#ifdef CONFIG_VSERVER_COWBL +restart: ++#endif file = get_empty_filp(); - if (!file) - return ERR_PTR(-ENFILE); -@@ -2986,6 +3113,16 @@ static struct file *path_openat(int dfd, - error = do_last(nd, &path, file, op, &opened, pathname); - put_link(nd, &link, cookie); + if (IS_ERR(file)) + return file; +@@ -3559,6 +3688,12 @@ static struct file *path_openat(struct n + } } -+ + terminate_walk(nd); +#ifdef CONFIG_VSERVER_COWBL + if (error == -EMLINK) { -+ if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT)) -+ path_put(&nd->root); -+ if (base) -+ fput(base); ++ // path_cleanup(nd); + goto restart; + } +#endif - out: - if (nd->root.mnt && !(nd->flags & LOOKUP_ROOT)) - path_put(&nd->root); -@@ -3090,6 +3227,11 @@ struct dentry *kern_path_create(int dfd, + out2: + if (!(opened & FILE_OPENED)) { + BUG_ON(!error); +@@ -3679,6 +3814,11 @@ static struct dentry *filename_create(in goto fail; } - *path = nd.path; -+ vxdprintk(VXD_CBIT(misc, 3), "kern_path_create path.dentry = %p (%.*s), dentry = %p (%.*s), d_inode = %p", + putname(name); ++ vxdprintk(VXD_CBIT(misc, 3), "filename_create path.dentry = %p (%.*s), dentry = %p (%.*s), d_inode = %p", + path->dentry, path->dentry->d_name.len, + path->dentry->d_name.name, dentry, + dentry->d_name.len, dentry->d_name.name, @@ -4641,63 +4081,99 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c return dentry; fail: dput(dentry); -@@ -3556,7 +3698,7 @@ int vfs_link(struct dentry *old_dentry, +@@ -3797,6 +3937,7 @@ retry: + error = vfs_mknod(path.dentry->d_inode,dentry,mode,0); + break; + } ++ + out: + done_path_create(&path, dentry); + if (retry_estale(error, lookup_flags)) { +@@ -4218,7 +4359,7 @@ int vfs_link(struct dentry *old_dentry, /* * A link to an append-only or immutable file cannot be created. */ - if (IS_APPEND(inode) || IS_IMMUTABLE(inode)) + if (IS_APPEND(inode) || IS_IXORUNLINK(inode)) return -EPERM; - if (!dir->i_op->link) - return -EPERM; -@@ -3945,6 +4087,275 @@ int vfs_follow_link(struct nameidata *nd - return __vfs_follow_link(nd, link); + /* + * Updating the link count will likely cause i_uid and i_gid to +@@ -4748,6 +4889,326 @@ const char *vfs_get_link(struct dentry * } + EXPORT_SYMBOL(vfs_get_link); + +#ifdef CONFIG_VSERVER_COWBL + +static inline ++void dump_path(const char *name, struct path *path) ++{ ++ vxdprintk(VXD_CBIT(misc, 3), ++ "%s: path=%p mnt=%p dentry=%p", name, path, ++ path ? path->mnt : NULL, ++ path ? path->dentry : NULL); ++ ++ if (path && path->mnt) ++ vxdprintk(VXD_CBIT(misc, 3), ++ "%s: path mnt_sb=%p[#%d,#%d] mnt_root=%p[#%d]", name, ++ path->mnt->mnt_sb, ++ path->mnt->mnt_sb ? path->mnt->mnt_sb->s_count : -1, ++ path->mnt->mnt_sb ? atomic_read(&path->mnt->mnt_sb->s_active) : -1, ++ path->mnt->mnt_root, ++ path->mnt->mnt_root ? path->mnt->mnt_root->d_lockref.count : -1); ++ ++ if (path && path->dentry) ++ vxdprintk(VXD_CBIT(misc, 3), ++ "%s: path dentry=%p[#%d]", name, ++ path->dentry, ++ path->dentry ? path->dentry->d_lockref.count : -1); ++} ++ ++static inline +long do_cow_splice(struct file *in, struct file *out, size_t len) +{ + loff_t ppos = 0; ++ loff_t opos = 0; + -+ return do_splice_direct(in, &ppos, out, len, 0); ++ return do_splice_direct(in, &ppos, out, &opos, len, 0); +} + +struct dentry *cow_break_link(const char *pathname) +{ -+ int ret, mode, pathlen, redo = 0; -+ struct nameidata old_nd, dir_nd; -+ struct path dir_path, *old_path, *new_path; ++ int ret, mode, pathlen, redo = 0, drop = 1; ++ struct path old_path = {}, par_path = {}, dir_path = {}, *new_path = NULL; + struct dentry *dir, *old_dentry, *new_dentry = NULL; + struct file *old_file; + struct file *new_file; ++ struct qstr new_qstr; ++ int new_type; + char *to, *path, pad='\251'; + loff_t size; ++ struct filename *filename = getname_kernel(pathname); ++ struct filename *to_filename; + + vxdprintk(VXD_CBIT(misc, 1), + "cow_break_link(" VS_Q("%s") ")", pathname); + + path = kmalloc(PATH_MAX, GFP_KERNEL); + ret = -ENOMEM; -+ if (!path) ++ if (!path || IS_ERR(filename)) + goto out; + -+ /* old_nd.path will have refs to dentry and mnt */ -+ ret = do_path_lookup(AT_FDCWD, pathname, LOOKUP_FOLLOW, &old_nd); ++ /* old_path will have refs to dentry and mnt */ ++ ret = filename_lookup(AT_FDCWD, filename, LOOKUP_FOLLOW, &old_path, NULL); + vxdprintk(VXD_CBIT(misc, 2), + "do_path_lookup(old): %d", ret); + if (ret < 0) + goto out_free_path; + -+ /* dentry/mnt refs handed over to old_path */ -+ old_path = &old_nd.path; ++ dump_path("cow (old)", &old_path); ++ + /* no explicit reference for old_dentry here */ -+ old_dentry = old_path->dentry; ++ old_dentry = old_path.dentry; + + mode = old_dentry->d_inode->i_mode; -+ to = d_path(old_path, path, PATH_MAX-2); ++ to = d_path(&old_path, path, PATH_MAX-2); + pathlen = strlen(to); + vxdprintk(VXD_CBIT(misc, 2), + "old path " VS_Q("%s") " [%p:" VS_Q("%.*s") ":%d]", to, @@ -4715,30 +4191,36 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + + vxdprintk(VXD_CBIT(misc, 1), "temp copy " VS_Q("%s"), to); + -+ /* dir_nd.path will have refs to dentry and mnt */ -+ ret = do_path_lookup(AT_FDCWD, to, -+ LOOKUP_PARENT | LOOKUP_OPEN | LOOKUP_CREATE, &dir_nd); -+ vxdprintk(VXD_CBIT(misc, 2), "do_path_lookup(new): %d", ret); -+ if (ret < 0) ++ /* dir_path will have refs to dentry and mnt */ ++ to_filename = getname_kernel(to); ++ to_filename = filename_parentat(AT_FDCWD, to_filename, ++ LOOKUP_PARENT | LOOKUP_OPEN | LOOKUP_CREATE, &par_path, &new_qstr, &new_type); ++ vxdprintk(VXD_CBIT(misc, 2), "filename_parentat(new): %p", to_filename); ++ dump_path("cow (par)", &par_path); ++ if (IS_ERR(to_filename)) + goto retry; + ++ vxdprintk(VXD_CBIT(misc, 2), "to_filename refcnt=%d", to_filename->refcnt); ++ + /* this puppy downs the dir inode mutex if successful. + dir_path will hold refs to dentry and mnt and -+ we'll have get write access to the mnt */ -+ new_dentry = kern_path_create(AT_FDCWD, to, &dir_path, 0); ++ we'll have write access to the mnt */ ++ new_dentry = filename_create(AT_FDCWD, to_filename, &dir_path, 0); + if (!new_dentry || IS_ERR(new_dentry)) { -+ path_put(&dir_nd.path); ++ path_put(&par_path); + vxdprintk(VXD_CBIT(misc, 2), -+ "kern_path_create(new) failed with %ld", ++ "filename_create(new) failed with %ld", + PTR_ERR(new_dentry)); + goto retry; + } + vxdprintk(VXD_CBIT(misc, 2), -+ "kern_path_create(new): %p [" VS_Q("%.*s") ":%d]", ++ "filename_create(new): %p [" VS_Q("%.*s") ":%d]", + new_dentry, + new_dentry->d_name.len, new_dentry->d_name.name, + new_dentry->d_name.len); + ++ dump_path("cow (dir)", &dir_path); ++ + /* take a reference on new_dentry */ + dget(new_dentry); + @@ -4746,7 +4228,7 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + new_path = &dir_path; + + /* dentry for old/new dir */ -+ dir = dir_nd.path.dentry; ++ dir = par_path.dentry; + + /* give up reference on dir */ + dput(new_path->dentry); @@ -4758,8 +4240,8 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + vxdprintk(VXD_CBIT(misc, 2), + "vfs_create(new): %d", ret); + if (ret == -EEXIST) { -+ mutex_unlock(&dir->d_inode->i_mutex); -+ path_put(&dir_nd.path); ++ path_put(&par_path); ++ inode_unlock(dir->d_inode); + mnt_drop_write(new_path->mnt); + path_put(new_path); + new_dentry = NULL; @@ -4768,13 +4250,13 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + else if (ret < 0) + goto out_unlock_new; + -+ /* drop out early, ret passes ENOENT */ ++ /* the old file went away */ + ret = -ENOENT; + if ((redo = d_unhashed(old_dentry))) + goto out_unlock_new; + + /* doesn't change refs for old_path */ -+ old_file = dentry_open(old_path, O_RDONLY, current_cred()); ++ old_file = dentry_open(&old_path, O_RDONLY, current_cred()); + vxdprintk(VXD_CBIT(misc, 2), + "dentry_open(old): %p", old_file); + if (IS_ERR(old_file)) { @@ -4791,7 +4273,15 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + goto out_fput_old; + } + -+ size = i_size_read(old_file->f_dentry->d_inode); ++ /* unlock the inode from filename_create() */ ++ inode_unlock(dir->d_inode); ++ ++ /* drop write access to mnt */ ++ mnt_drop_write(new_path->mnt); ++ ++ drop = 0; ++ ++ size = i_size_read(old_file->f_path.dentry->d_inode); + ret = do_cow_splice(old_file, new_file, size); + vxdprintk(VXD_CBIT(misc, 2), "do_splice_direct: %d", ret); + if (ret < 0) { @@ -4826,8 +4316,8 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + new_dentry->d_name.len, + old_dentry->d_name.len, old_dentry->d_name.name, + old_dentry->d_name.len); -+ ret = vfs_rename(dir_nd.path.dentry->d_inode, new_dentry, -+ old_dentry->d_parent->d_inode, old_dentry); ++ ret = vfs_rename(par_path.dentry->d_inode, new_dentry, ++ old_dentry->d_parent->d_inode, old_dentry, NULL, 0); + vxdprintk(VXD_CBIT(misc, 2), "vfs_rename: %d", ret); + +out_unlock: @@ -4846,33 +4336,36 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + fput(old_file); + +out_unlock_new: -+ /* drop references from dir_nd.path */ -+ path_put(&dir_nd.path); ++ /* drop references from par_path */ ++ path_put(&par_path); + -+ /* drop write access to mnt */ -+ mnt_drop_write(new_path->mnt); ++ if (drop) { ++ /* unlock the inode from filename_create() */ ++ inode_unlock(dir->d_inode); ++ ++ /* drop write access to mnt */ ++ mnt_drop_write(new_path->mnt); ++ } + -+ /* unlock the inode mutex from kern_path_create() */ -+ mutex_unlock(&dir->d_inode->i_mutex); + if (!ret) + goto out_redo; + + /* error path cleanup */ -+ vfs_unlink(dir->d_inode, new_dentry); ++ vfs_unlink(dir->d_inode, new_dentry, NULL); + +out_redo: + if (!redo) + goto out_rel_both; + + /* lookup dentry once again -+ old_nd.path will be freed as old_path in out_rel_old */ -+ ret = do_path_lookup(AT_FDCWD, pathname, LOOKUP_FOLLOW, &old_nd); ++ old_path will be freed as old_path in out_rel_old */ ++ ret = filename_lookup(AT_FDCWD, filename, LOOKUP_FOLLOW, &old_path, NULL); + if (ret) + goto out_rel_both; + + /* drop reference on new_dentry */ + dput(new_dentry); -+ new_dentry = old_path->dentry; ++ new_dentry = old_path.dentry; + dget(new_dentry); + vxdprintk(VXD_CBIT(misc, 2), + "do_path_lookup(redo): %p [" VS_Q("%.*s") ":%d]", @@ -4881,10 +4374,12 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + new_dentry->d_name.len); + +out_rel_both: ++ dump_path("put (new)", new_path); + if (new_path) + path_put(new_path); +out_rel_old: -+ path_put(old_path); ++ dump_path("put (old)", &old_path); ++ path_put(&old_path); +out_free_path: + kfree(path); +out: @@ -4892,6 +4387,8 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + dput(new_dentry); + new_dentry = ERR_PTR(ret); + } ++ // if (!IS_ERR(filename)) ++ // putname(filename); + vxdprintk(VXD_CBIT(misc, 3), + "cow_break_link returning with %p", new_dentry); + return new_dentry; @@ -4923,21 +4420,18 @@ diff -NurpP --minimal linux-3.7/fs/namei.c linux-3.7-vs2.3.5.1/fs/namei.c + return length; +} + - /* get the link contents into pagecache */ - static char *page_getlink(struct dentry * dentry, struct page **ppage) - { -@@ -4068,3 +4479,4 @@ EXPORT_SYMBOL(vfs_symlink); - EXPORT_SYMBOL(vfs_unlink); - EXPORT_SYMBOL(dentry_unhash); - EXPORT_SYMBOL(generic_readlink); +EXPORT_SYMBOL(vx_info_mnt_namespace); -diff -NurpP --minimal linux-3.7/fs/namespace.c linux-3.7-vs2.3.5.1/fs/namespace.c ---- linux-3.7/fs/namespace.c 2012-12-11 15:47:35.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/namespace.c 2012-12-11 17:17:30.000000000 +0000 -@@ -20,6 +20,11 @@ - #include /* get_fs_root et.al. */ - #include /* fsnotify_vfsmount_delete */ - #include ++ + /* get the link contents into pagecache */ + const char *page_get_link(struct dentry *dentry, struct inode *inode, + struct delayed_call *callback) +diff -urNp -x '*.orig' linux-4.9/fs/namespace.c linux-4.9/fs/namespace.c +--- linux-4.9/fs/namespace.c 2021-02-24 15:47:32.290675776 +0100 ++++ linux-4.9/fs/namespace.c 2021-02-24 15:47:45.074409033 +0100 +@@ -24,6 +24,11 @@ + #include + #include + #include +#include +#include +#include @@ -4946,7 +4440,7 @@ diff -NurpP --minimal linux-3.7/fs/namespace.c linux-3.7-vs2.3.5.1/fs/namespace. #include "pnode.h" #include "internal.h" -@@ -749,6 +754,10 @@ vfs_kern_mount(struct file_system_type * +@@ -980,6 +985,10 @@ vfs_kern_mount(struct file_system_type * if (!type) return ERR_PTR(-ENODEV); @@ -4957,108 +4451,66 @@ diff -NurpP --minimal linux-3.7/fs/namespace.c linux-3.7-vs2.3.5.1/fs/namespace. mnt = alloc_vfsmnt(name); if (!mnt) return ERR_PTR(-ENOMEM); -@@ -801,6 +810,7 @@ static struct mount *clone_mnt(struct mo +@@ -1071,6 +1080,7 @@ static struct mount *clone_mnt(struct mo mnt->mnt.mnt_root = dget(root); mnt->mnt_mountpoint = mnt->mnt.mnt_root; mnt->mnt_parent = mnt; -+ mnt->mnt_tag = old->mnt_tag; - br_write_lock(&vfsmount_lock); ++ mnt->mnt_tag = old->mnt_tag; + lock_mount_hash(); list_add_tail(&mnt->mnt_instance, &sb->s_mounts); - br_write_unlock(&vfsmount_lock); -@@ -1266,7 +1276,7 @@ SYSCALL_DEFINE2(umount, char __user *, n - goto dput_and_out; - - retval = -EPERM; -- if (!capable(CAP_SYS_ADMIN)) -+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT)) - goto dput_and_out; - - retval = do_umount(mnt, flags); -@@ -1292,7 +1302,7 @@ SYSCALL_DEFINE1(oldumount, char __user * - - static int mount_is_safe(struct path *path) + unlock_mount_hash(); +@@ -1666,7 +1676,8 @@ out_unlock: + */ + static inline bool may_mount(void) { -- if (capable(CAP_SYS_ADMIN)) -+ if (vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT)) - return 0; - return -EPERM; - #ifdef notyet -@@ -1610,7 +1620,7 @@ static int do_change_type(struct path *p - int type; - int err = 0; - -- if (!capable(CAP_SYS_ADMIN)) -+ if (!vx_capable(CAP_SYS_ADMIN, VXC_NAMESPACE)) - return -EPERM; +- return ns_capable(current->nsproxy->mnt_ns->user_ns, CAP_SYS_ADMIN); ++ return vx_ns_capable(current->nsproxy->mnt_ns->user_ns, ++ CAP_SYS_ADMIN, VXC_SECURE_MOUNT); + } - if (path->dentry != path->mnt->mnt_root) -@@ -1626,6 +1636,7 @@ static int do_change_type(struct path *p + static inline bool may_mandlock(void) +@@ -2181,6 +2192,7 @@ static int do_change_type(struct path *p if (err) goto out_unlock; } + // mnt->mnt_flags = mnt_flags; - br_write_lock(&vfsmount_lock); + lock_mount_hash(); for (m = mnt; m; m = (recurse ? next_mnt(m, mnt) : NULL)) -@@ -1641,12 +1652,14 @@ static int do_change_type(struct path *p +@@ -2209,12 +2221,14 @@ static bool has_locked_children(struct m * do loopback mount. */ static int do_loopback(struct path *path, const char *old_name, - int recurse) -+ tag_t tag, unsigned long flags, int mnt_flags) ++ vtag_t tag, unsigned long flags, int mnt_flags) { - LIST_HEAD(umount_list); struct path old_path; - struct mount *mnt = NULL, *old; - int err = mount_is_safe(path); + struct mount *mnt = NULL, *old, *parent; + struct mountpoint *mp; + int recurse = flags & MS_REC; + int err; + - if (err) - return err; if (!old_name || !*old_name) -@@ -1715,13 +1728,13 @@ static int change_mount_flags(struct vfs + return -EINVAL; + err = kern_path(old_name, LOOKUP_FOLLOW|LOOKUP_AUTOMOUNT, &old_path); +@@ -2294,7 +2308,7 @@ static int change_mount_flags(struct vfs * on it - tough luck. */ static int do_remount(struct path *path, int flags, int mnt_flags, - void *data) -+ void *data, xid_t xid) ++ void *data, vxid_t xid) { int err; struct super_block *sb = path->mnt->mnt_sb; - struct mount *mnt = real_mount(path->mnt); - -- if (!capable(CAP_SYS_ADMIN)) -+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_REMOUNT)) - return -EPERM; - - if (!check_mnt(mnt)) -@@ -1770,7 +1783,7 @@ static int do_move_mount(struct path *pa - struct mount *p; - struct mount *old; - int err = 0; -- if (!capable(CAP_SYS_ADMIN)) -+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT)) - return -EPERM; - if (!old_name || !*old_name) - return -EINVAL; -@@ -1927,7 +1940,7 @@ static int do_new_mount(struct path *pat - return -EINVAL; - - /* we need capabilities... */ -- if (!capable(CAP_SYS_ADMIN)) -+ if (!vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT)) - return -EPERM; - - mnt = do_kern_mount(type, flags, name, data); -@@ -2197,6 +2210,7 @@ long do_mount(const char *dev_name, cons +@@ -2779,6 +2793,7 @@ long do_mount(const char *dev_name, cons struct path path; int retval = 0; int mnt_flags = 0; -+ tag_t tag = 0; ++ vtag_t tag = 0; /* Discard magic */ if ((flags & MS_MGC_MSK) == MS_MGC_VAL) -@@ -2224,6 +2238,12 @@ long do_mount(const char *dev_name, cons +@@ -2806,6 +2821,12 @@ long do_mount(const char *dev_name, cons if (!(flags & MS_NOATIME)) mnt_flags |= MNT_RELATIME; @@ -5071,15 +4523,16 @@ diff -NurpP --minimal linux-3.7/fs/namespace.c linux-3.7-vs2.3.5.1/fs/namespace. /* Separate the per-mountpoint flags */ if (flags & MS_NOSUID) mnt_flags |= MNT_NOSUID; -@@ -2240,15 +2260,17 @@ long do_mount(const char *dev_name, cons - if (flags & MS_RDONLY) - mnt_flags |= MNT_READONLY; +@@ -2830,15 +2851,18 @@ long do_mount(const char *dev_name, cons + mnt_flags |= path.mnt->mnt_flags & MNT_ATIME_MASK; + } -+ if (!capable(CAP_SYS_ADMIN)) ++ if (!vx_capable(CAP_SYS_ADMIN, VXC_DEV_MOUNT)) + mnt_flags |= MNT_NODEV; ++ flags &= ~(MS_NOSUID | MS_NOEXEC | MS_NODEV | MS_ACTIVE | MS_BORN | MS_NOATIME | MS_NODIRATIME | MS_RELATIME| MS_KERNMOUNT | - MS_STRICTATIME); + MS_STRICTATIME | MS_NOREMOTELOCK | MS_SUBMOUNT); if (flags & MS_REMOUNT) retval = do_remount(&path, flags & ~MS_REMOUNT, mnt_flags, @@ -5091,20 +4544,20 @@ diff -NurpP --minimal linux-3.7/fs/namespace.c linux-3.7-vs2.3.5.1/fs/namespace. else if (flags & (MS_SHARED | MS_PRIVATE | MS_SLAVE | MS_UNBINDABLE)) retval = do_change_type(&path, flags); else if (flags & MS_MOVE) -@@ -2329,6 +2351,7 @@ static struct mnt_namespace *dup_mnt_ns( - q = next_mnt(q, new); +@@ -2979,6 +3003,7 @@ struct mnt_namespace *copy_mnt_ns(unsign + p = next_mnt(p, old); } - up_write(&namespace_sem); + namespace_unlock(); + atomic_inc(&vs_global_mnt_ns); if (rootmnt) mntput(rootmnt); -@@ -2524,9 +2547,10 @@ SYSCALL_DEFINE2(pivot_root, const char _ - error = -EINVAL; +@@ -3154,9 +3179,10 @@ SYSCALL_DEFINE2(pivot_root, const char _ new_mnt = real_mount(new.mnt); root_mnt = real_mount(root.mnt); -- if (IS_MNT_SHARED(real_mount(old.mnt)) || -+ if ((IS_MNT_SHARED(real_mount(old.mnt)) || + old_mnt = real_mount(old.mnt); +- if (IS_MNT_SHARED(old_mnt) || ++ if ((IS_MNT_SHARED(old_mnt) || IS_MNT_SHARED(new_mnt->mnt_parent) || - IS_MNT_SHARED(root_mnt->mnt_parent)) + IS_MNT_SHARED(root_mnt->mnt_parent)) && @@ -5112,18 +4565,18 @@ diff -NurpP --minimal linux-3.7/fs/namespace.c linux-3.7-vs2.3.5.1/fs/namespace. goto out4; if (!check_mnt(root_mnt) || !check_mnt(new_mnt)) goto out4; -@@ -2647,6 +2671,7 @@ void put_mnt_ns(struct mnt_namespace *ns - br_write_unlock(&vfsmount_lock); - up_write(&namespace_sem); - release_mounts(&umount_list); +@@ -3294,6 +3320,7 @@ void put_mnt_ns(struct mnt_namespace *ns + if (!atomic_dec_and_test(&ns->count)) + return; + drop_collected_mounts(&ns->root->mnt); + atomic_dec(&vs_global_mnt_ns); - kfree(ns); + free_mnt_ns(ns); } -diff -NurpP --minimal linux-3.7/fs/nfs/client.c linux-3.7-vs2.3.5.1/fs/nfs/client.c ---- linux-3.7/fs/nfs/client.c 2012-12-11 15:47:35.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/nfs/client.c 2012-12-11 15:56:32.000000000 +0000 -@@ -684,6 +684,9 @@ int nfs_init_server_rpcclient(struct nfs +diff -urNp -x '*.orig' linux-4.9/fs/nfs/client.c linux-4.9/fs/nfs/client.c +--- linux-4.9/fs/nfs/client.c 2021-02-24 15:47:32.290675776 +0100 ++++ linux-4.9/fs/nfs/client.c 2021-02-24 15:47:45.074409033 +0100 +@@ -586,6 +586,9 @@ int nfs_init_server_rpcclient(struct nfs if (server->flags & NFS_MOUNT_SOFT) server->client->cl_softrtry = 1; @@ -5133,7 +4586,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/client.c linux-3.7-vs2.3.5.1/fs/nfs/clien return 0; } EXPORT_SYMBOL_GPL(nfs_init_server_rpcclient); -@@ -863,6 +866,10 @@ static void nfs_server_set_fsinfo(struct +@@ -762,6 +765,10 @@ static void nfs_server_set_fsinfo(struct server->acdirmin = server->acdirmax = 0; } @@ -5144,10 +4597,10 @@ diff -NurpP --minimal linux-3.7/fs/nfs/client.c linux-3.7-vs2.3.5.1/fs/nfs/clien server->maxfilesize = fsinfo->maxfilesize; server->time_delta = fsinfo->time_delta; -diff -NurpP --minimal linux-3.7/fs/nfs/dir.c linux-3.7-vs2.3.5.1/fs/nfs/dir.c ---- linux-3.7/fs/nfs/dir.c 2012-12-11 15:47:35.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/nfs/dir.c 2012-12-11 15:56:32.000000000 +0000 -@@ -36,6 +36,7 @@ +diff -urNp -x '*.orig' linux-4.9/fs/nfs/dir.c linux-4.9/fs/nfs/dir.c +--- linux-4.9/fs/nfs/dir.c 2021-02-24 15:47:32.294009214 +0100 ++++ linux-4.9/fs/nfs/dir.c 2021-02-24 15:47:45.074409033 +0100 +@@ -37,6 +37,7 @@ #include #include #include @@ -5155,169 +4608,145 @@ diff -NurpP --minimal linux-3.7/fs/nfs/dir.c linux-3.7-vs2.3.5.1/fs/nfs/dir.c #include "delegation.h" #include "iostat.h" -@@ -1252,6 +1253,7 @@ struct dentry *nfs_lookup(struct inode * +@@ -1431,6 +1432,7 @@ struct dentry *nfs_lookup(struct inode * /* Success: notify readdir to use READDIRPLUS */ nfs_advise_use_readdirplus(dir); + dx_propagate_tag(nd, inode); no_entry: - res = d_materialise_unique(dentry, inode); + res = d_splice_alias(inode, dentry); if (res != NULL) { -diff -NurpP --minimal linux-3.7/fs/nfs/inode.c linux-3.7-vs2.3.5.1/fs/nfs/inode.c ---- linux-3.7/fs/nfs/inode.c 2012-12-11 15:47:35.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/nfs/inode.c 2012-12-11 15:56:32.000000000 +0000 -@@ -39,6 +39,7 @@ +diff -urNp -x '*.orig' linux-4.9/fs/nfs/inode.c linux-4.9/fs/nfs/inode.c +--- linux-4.9/fs/nfs/inode.c 2021-02-24 15:47:32.294009214 +0100 ++++ linux-4.9/fs/nfs/inode.c 2021-02-24 15:47:45.074409033 +0100 +@@ -38,6 +38,7 @@ + #include #include #include - #include +#include #include -@@ -279,6 +280,8 @@ nfs_fhget(struct super_block *sb, struct +@@ -383,6 +384,8 @@ nfs_fhget(struct super_block *sb, struct if (inode->i_state & I_NEW) { struct nfs_inode *nfsi = NFS_I(inode); unsigned long now = jiffies; -+ uid_t uid; -+ gid_t gid; ++ kuid_t kuid; ++ kgid_t kgid; /* We set i_ino for the few things that still rely on it, * such as stat(2) */ -@@ -323,8 +326,8 @@ nfs_fhget(struct super_block *sb, struct +@@ -427,8 +430,8 @@ nfs_fhget(struct super_block *sb, struct inode->i_version = 0; inode->i_size = 0; clear_nlink(inode); -- inode->i_uid = -2; -- inode->i_gid = -2; -+ uid = -2; -+ gid = -2; +- inode->i_uid = make_kuid(&init_user_ns, -2); +- inode->i_gid = make_kgid(&init_user_ns, -2); ++ kuid = make_kuid(&init_user_ns, -2); ++ kgid = make_kgid(&init_user_ns, -2); inode->i_blocks = 0; memset(nfsi->cookieverf, 0, sizeof(nfsi->cookieverf)); nfsi->write_io = 0; -@@ -358,11 +361,11 @@ nfs_fhget(struct super_block *sb, struct +@@ -463,11 +466,11 @@ nfs_fhget(struct super_block *sb, struct else if (nfs_server_capable(inode, NFS_CAP_NLINK)) - nfsi->cache_validity |= NFS_INO_INVALID_ATTR; + nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATTR); if (fattr->valid & NFS_ATTR_FATTR_OWNER) - inode->i_uid = fattr->uid; -+ uid = fattr->uid; ++ kuid = fattr->uid; else if (nfs_server_capable(inode, NFS_CAP_OWNER)) - nfsi->cache_validity |= NFS_INO_INVALID_ATTR; + nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATTR); if (fattr->valid & NFS_ATTR_FATTR_GROUP) - inode->i_gid = fattr->gid; -+ gid = fattr->gid; ++ kgid = fattr->gid; else if (nfs_server_capable(inode, NFS_CAP_OWNER_GROUP)) - nfsi->cache_validity |= NFS_INO_INVALID_ATTR; + nfs_set_cache_invalid(inode, NFS_INO_INVALID_ATTR); if (fattr->valid & NFS_ATTR_FATTR_BLOCKS_USED) -@@ -373,6 +376,11 @@ nfs_fhget(struct super_block *sb, struct +@@ -478,6 +481,10 @@ nfs_fhget(struct super_block *sb, struct */ inode->i_blocks = nfs_calc_block_size(fattr->du.nfs3.used); } -+ inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid); -+ inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid); -+ inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid, 0); ++ inode->i_uid = INOTAG_KUID(DX_TAG(inode), kuid, kgid); ++ inode->i_gid = INOTAG_KGID(DX_TAG(inode), kuid, kgid); ++ inode->i_tag = INOTAG_KTAG(DX_TAG(inode), kuid, kgid, GLOBAL_ROOT_TAG); + /* maybe fattr->xid someday */ -+ - nfsi->attrtimeo = NFS_MINATTRTIMEO(inode); - nfsi->attrtimeo_timestamp = now; - nfsi->access_cache = RB_ROOT; -@@ -494,6 +502,8 @@ void nfs_setattr_update_inode(struct ino + + nfs_setsecurity(inode, fattr, label); + +@@ -619,6 +626,8 @@ void nfs_setattr_update_inode(struct ino inode->i_uid = attr->ia_uid; if ((attr->ia_valid & ATTR_GID) != 0) inode->i_gid = attr->ia_gid; + if ((attr->ia_valid & ATTR_TAG) && IS_TAGGED(inode)) + inode->i_tag = attr->ia_tag; - NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL; - spin_unlock(&inode->i_lock); + nfs_set_cache_invalid(inode, NFS_INO_INVALID_ACCESS + | NFS_INO_INVALID_ACL); } -@@ -968,6 +978,9 @@ static int nfs_check_inode_attributes(st +@@ -1273,7 +1282,9 @@ static int nfs_check_inode_attributes(st struct nfs_inode *nfsi = NFS_I(inode); loff_t cur_size, new_isize; unsigned long invalid = 0; -+ uid_t uid; -+ gid_t gid; -+ tag_t tag; - +- ++ kuid_t kuid; ++ kgid_t kgid; ++ ktag_t ktag; if (nfs_have_delegated_attributes(inode)) -@@ -993,13 +1006,18 @@ static int nfs_check_inode_attributes(st - invalid |= NFS_INO_INVALID_ATTR|NFS_INO_REVAL_PAGECACHE; + return 0; +@@ -1302,13 +1313,18 @@ static int nfs_check_inode_attributes(st + } } -+ uid = INOTAG_UID(DX_TAG(inode), fattr->uid, fattr->gid); -+ gid = INOTAG_GID(DX_TAG(inode), fattr->uid, fattr->gid); -+ tag = INOTAG_TAG(DX_TAG(inode), fattr->uid, fattr->gid, 0); ++ kuid = INOTAG_KUID(DX_TAG(inode), fattr->uid, fattr->gid); ++ kgid = INOTAG_KGID(DX_TAG(inode), fattr->uid, fattr->gid); ++ ktag = INOTAG_KTAG(DX_TAG(inode), fattr->uid, fattr->gid, GLOBAL_ROOT_TAG); + /* Have any file permissions changed? */ if ((fattr->valid & NFS_ATTR_FATTR_MODE) && (inode->i_mode & S_IALLUGO) != (fattr->mode & S_IALLUGO)) invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL; -- if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && inode->i_uid != fattr->uid) -+ if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && uid != fattr->uid) +- if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && !uid_eq(inode->i_uid, fattr->uid)) ++ if ((fattr->valid & NFS_ATTR_FATTR_OWNER) && !uid_eq(inode->i_uid, kuid)) invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL; -- if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && inode->i_gid != fattr->gid) -+ if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && gid != fattr->gid) +- if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && !gid_eq(inode->i_gid, fattr->gid)) ++ if ((fattr->valid & NFS_ATTR_FATTR_GROUP) && !gid_eq(inode->i_gid, kgid)) invalid |= NFS_INO_INVALID_ATTR | NFS_INO_INVALID_ACCESS | NFS_INO_INVALID_ACL; + /* maybe check for tag too? */ /* Has the link count changed? */ if ((fattr->valid & NFS_ATTR_FATTR_NLINK) && inode->i_nlink != fattr->nlink) -@@ -1303,6 +1321,9 @@ static int nfs_update_inode(struct inode - unsigned long invalid = 0; - unsigned long now = jiffies; +@@ -1667,6 +1683,9 @@ static int nfs_update_inode(struct inode unsigned long save_cache_validity; -+ uid_t uid; -+ gid_t gid; -+ tag_t tag; + bool have_writers = nfs_file_has_buffered_writers(nfsi); + bool cache_revalidated = true; ++ kuid_t kuid; ++ kgid_t kgid; ++ ktag_t ktag; - dfprintk(VFS, "NFS: %s(%s/%ld fh_crc=0x%08x ct=%d info=0x%x)\n", + dfprintk(VFS, "NFS: %s(%s/%lu fh_crc=0x%08x ct=%d info=0x%x)\n", __func__, inode->i_sb->s_id, inode->i_ino, -@@ -1404,6 +1425,9 @@ static int nfs_update_inode(struct inode - | NFS_INO_REVAL_PAGECACHE - | NFS_INO_REVAL_FORCED); +@@ -1786,6 +1805,9 @@ static int nfs_update_inode(struct inode + cache_revalidated = false; + } -+ uid = TAGINO_UID(DX_TAG(inode), inode->i_uid, inode->i_tag); -+ gid = TAGINO_GID(DX_TAG(inode), inode->i_gid, inode->i_tag); -+ tag = inode->i_tag; ++ kuid = TAGINO_KUID(DX_TAG(inode), inode->i_uid, inode->i_tag); ++ kgid = TAGINO_KGID(DX_TAG(inode), inode->i_gid, inode->i_tag); ++ ktag = TAGINO_KTAG(DX_TAG(inode), inode->i_tag); if (fattr->valid & NFS_ATTR_FATTR_ATIME) memcpy(&inode->i_atime, &fattr->atime, sizeof(inode->i_atime)); -@@ -1425,9 +1449,9 @@ static int nfs_update_inode(struct inode - | NFS_INO_REVAL_FORCED); - - if (fattr->valid & NFS_ATTR_FATTR_OWNER) { -- if (inode->i_uid != fattr->uid) { -+ if (uid != fattr->uid) { - invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL; -- inode->i_uid = fattr->uid; -+ uid = fattr->uid; - } - } else if (server->caps & NFS_CAP_OWNER) - invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR -@@ -1436,9 +1460,9 @@ static int nfs_update_inode(struct inode - | NFS_INO_REVAL_FORCED); - - if (fattr->valid & NFS_ATTR_FATTR_GROUP) { -- if (inode->i_gid != fattr->gid) { -+ if (gid != fattr->gid) { - invalid |= NFS_INO_INVALID_ATTR|NFS_INO_INVALID_ACCESS|NFS_INO_INVALID_ACL; -- inode->i_gid = fattr->gid; -+ gid = fattr->gid; - } - } else if (server->caps & NFS_CAP_OWNER_GROUP) - invalid |= save_cache_validity & (NFS_INO_INVALID_ATTR -@@ -1446,6 +1470,10 @@ static int nfs_update_inode(struct inode - | NFS_INO_INVALID_ACL - | NFS_INO_REVAL_FORCED); +@@ -1840,6 +1862,10 @@ static int nfs_update_inode(struct inode + cache_revalidated = false; + } -+ inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid); -+ inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid); -+ inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid, tag); ++ inode->i_uid = INOTAG_KUID(DX_TAG(inode), kuid, kgid); ++ inode->i_gid = INOTAG_KGID(DX_TAG(inode), kuid, kgid); ++ inode->i_tag = INOTAG_KTAG(DX_TAG(inode), kuid, kgid, ktag); + if (fattr->valid & NFS_ATTR_FATTR_NLINK) { if (inode->i_nlink != fattr->nlink) { invalid |= NFS_INO_INVALID_ATTR; -diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3xdr.c ---- linux-3.7/fs/nfs/nfs3xdr.c 2012-10-04 13:27:40.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/nfs/nfs3xdr.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/nfs/nfs3xdr.c linux-4.9/fs/nfs/nfs3xdr.c +--- linux-4.9/fs/nfs/nfs3xdr.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/nfs/nfs3xdr.c 2021-02-24 15:47:45.074409033 +0100 @@ -20,6 +20,7 @@ #include #include @@ -5326,7 +4755,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3 #include "internal.h" #define NFSDBG_FACILITY NFSDBG_XDR -@@ -560,7 +561,8 @@ static __be32 *xdr_decode_nfstime3(__be3 +@@ -558,7 +559,8 @@ static __be32 *xdr_decode_nfstime3(__be3 * set_mtime mtime; * }; */ @@ -5336,7 +4765,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3 { u32 nbytes; __be32 *p; -@@ -592,15 +594,19 @@ static void encode_sattr3(struct xdr_str +@@ -590,15 +592,19 @@ static void encode_sattr3(struct xdr_str } else *p++ = xdr_zero; @@ -5344,9 +4773,9 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3 + if (attr->ia_valid & ATTR_UID || + (tag && (attr->ia_valid & ATTR_TAG))) { *p++ = xdr_one; -- *p++ = cpu_to_be32(attr->ia_uid); -+ *p++ = cpu_to_be32(TAGINO_UID(tag, -+ attr->ia_uid, attr->ia_tag)); +- *p++ = cpu_to_be32(from_kuid(&init_user_ns, attr->ia_uid)); ++ *p++ = cpu_to_be32(from_kuid(&init_user_ns, ++ TAGINO_KUID(tag, attr->ia_uid, attr->ia_tag))); } else *p++ = xdr_zero; @@ -5354,13 +4783,13 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3 + if (attr->ia_valid & ATTR_GID || + (tag && (attr->ia_valid & ATTR_TAG))) { *p++ = xdr_one; -- *p++ = cpu_to_be32(attr->ia_gid); -+ *p++ = cpu_to_be32(TAGINO_GID(tag, -+ attr->ia_gid, attr->ia_tag)); +- *p++ = cpu_to_be32(from_kgid(&init_user_ns, attr->ia_gid)); ++ *p++ = cpu_to_be32(from_kgid(&init_user_ns, ++ TAGINO_KGID(tag, attr->ia_gid, attr->ia_tag))); } else *p++ = xdr_zero; -@@ -879,7 +885,7 @@ static void nfs3_xdr_enc_setattr3args(st +@@ -887,7 +893,7 @@ static void nfs3_xdr_enc_setattr3args(st const struct nfs3_sattrargs *args) { encode_nfs_fh3(xdr, args->fh); @@ -5369,7 +4798,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3 encode_sattrguard3(xdr, args); } -@@ -1029,13 +1035,13 @@ static void nfs3_xdr_enc_write3args(stru +@@ -1037,13 +1043,13 @@ static void nfs3_xdr_enc_write3args(stru * }; */ static void encode_createhow3(struct xdr_stream *xdr, @@ -5385,7 +4814,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3 break; case NFS3_CREATE_EXCLUSIVE: encode_createverf3(xdr, args->verifier); -@@ -1050,7 +1056,7 @@ static void nfs3_xdr_enc_create3args(str +@@ -1058,7 +1064,7 @@ static void nfs3_xdr_enc_create3args(str const struct nfs3_createargs *args) { encode_diropargs3(xdr, args->fh, args->name, args->len); @@ -5394,7 +4823,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3 } /* -@@ -1066,7 +1072,7 @@ static void nfs3_xdr_enc_mkdir3args(stru +@@ -1074,7 +1080,7 @@ static void nfs3_xdr_enc_mkdir3args(stru const struct nfs3_mkdirargs *args) { encode_diropargs3(xdr, args->fh, args->name, args->len); @@ -5403,7 +4832,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3 } /* -@@ -1083,9 +1089,9 @@ static void nfs3_xdr_enc_mkdir3args(stru +@@ -1091,9 +1097,9 @@ static void nfs3_xdr_enc_mkdir3args(stru * }; */ static void encode_symlinkdata3(struct xdr_stream *xdr, @@ -5415,16 +4844,16 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3 encode_nfspath3(xdr, args->pages, args->pathlen); } -@@ -1094,7 +1100,7 @@ static void nfs3_xdr_enc_symlink3args(st +@@ -1102,7 +1108,7 @@ static void nfs3_xdr_enc_symlink3args(st const struct nfs3_symlinkargs *args) { encode_diropargs3(xdr, args->fromfh, args->fromname, args->fromlen); - encode_symlinkdata3(xdr, args); + encode_symlinkdata3(xdr, args, req->rq_task->tk_client->cl_tag); + xdr->buf->flags |= XDRBUF_WRITE; } - /* -@@ -1122,24 +1128,24 @@ static void nfs3_xdr_enc_symlink3args(st +@@ -1131,24 +1137,24 @@ static void nfs3_xdr_enc_symlink3args(st * }; */ static void encode_devicedata3(struct xdr_stream *xdr, @@ -5454,7 +4883,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3 break; case NF3REG: case NF3DIR: -@@ -1154,7 +1160,7 @@ static void nfs3_xdr_enc_mknod3args(stru +@@ -1163,7 +1169,7 @@ static void nfs3_xdr_enc_mknod3args(stru const struct nfs3_mknodargs *args) { encode_diropargs3(xdr, args->fh, args->name, args->len); @@ -5463,13 +4892,13 @@ diff -NurpP --minimal linux-3.7/fs/nfs/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfs/nfs3 } /* -diff -NurpP --minimal linux-3.7/fs/nfs/super.c linux-3.7-vs2.3.5.1/fs/nfs/super.c ---- linux-3.7/fs/nfs/super.c 2012-12-11 15:47:35.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/nfs/super.c 2012-12-11 17:09:13.000000000 +0000 -@@ -55,6 +55,7 @@ +diff -urNp -x '*.orig' linux-4.9/fs/nfs/super.c linux-4.9/fs/nfs/super.c +--- linux-4.9/fs/nfs/super.c 2021-02-24 15:47:32.300676089 +0100 ++++ linux-4.9/fs/nfs/super.c 2021-02-24 15:47:45.074409033 +0100 +@@ -54,6 +54,7 @@ + #include #include #include - #include +#include #include @@ -5503,7 +4932,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/super.c linux-3.7-vs2.3.5.1/fs/nfs/super. /* The following needs to be listed after all other options */ { Opt_nfsvers, "v%s" }, -@@ -678,6 +687,7 @@ static void nfs_show_mount_options(struc +@@ -644,6 +653,7 @@ static void nfs_show_mount_options(struc { NFS_MOUNT_NORDIRPLUS, ",nordirplus", "" }, { NFS_MOUNT_UNSHARED, ",nosharecache", "" }, { NFS_MOUNT_NORESVPORT, ",noresvport", "" }, @@ -5511,9 +4940,9 @@ diff -NurpP --minimal linux-3.7/fs/nfs/super.c linux-3.7-vs2.3.5.1/fs/nfs/super. { 0, NULL, NULL } }; const struct proc_nfs_info *nfs_infop; -@@ -1304,6 +1314,14 @@ static int nfs_parse_mount_options(char +@@ -1341,6 +1351,14 @@ static int nfs_parse_mount_options(char case Opt_nomigration: - mnt->options &= NFS_OPTION_MIGRATION; + mnt->options &= ~NFS_OPTION_MIGRATION; break; +#ifndef CONFIG_TAGGING_NONE + case Opt_tag: @@ -5526,7 +4955,7 @@ diff -NurpP --minimal linux-3.7/fs/nfs/super.c linux-3.7-vs2.3.5.1/fs/nfs/super. /* * options that take numeric values -@@ -1390,6 +1408,12 @@ static int nfs_parse_mount_options(char +@@ -1427,6 +1445,12 @@ static int nfs_parse_mount_options(char goto out_invalid_value; mnt->minorversion = option; break; @@ -5539,84 +4968,87 @@ diff -NurpP --minimal linux-3.7/fs/nfs/super.c linux-3.7-vs2.3.5.1/fs/nfs/super. /* * options that take text values -diff -NurpP --minimal linux-3.7/fs/nfsd/auth.c linux-3.7-vs2.3.5.1/fs/nfsd/auth.c ---- linux-3.7/fs/nfsd/auth.c 2012-07-22 21:39:41.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/nfsd/auth.c 2012-12-11 15:56:32.000000000 +0000 -@@ -2,6 +2,7 @@ +diff -urNp -x '*.orig' linux-4.9/fs/nfsd/auth.c linux-4.9/fs/nfsd/auth.c +--- linux-4.9/fs/nfsd/auth.c 2021-02-24 15:47:32.300676089 +0100 ++++ linux-4.9/fs/nfsd/auth.c 2021-02-24 15:47:45.074409033 +0100 +@@ -1,6 +1,7 @@ + /* Copyright (C) 1995, 1996 Olaf Kirch */ #include - #include +#include #include "nfsd.h" #include "auth.h" -@@ -37,6 +38,9 @@ int nfsd_setuser(struct svc_rqst *rqstp, +@@ -35,6 +36,9 @@ int nfsd_setuser(struct svc_rqst *rqstp, new->fsuid = rqstp->rq_cred.cr_uid; new->fsgid = rqstp->rq_cred.cr_gid; + /* FIXME: this desperately needs a tag :) -+ new->xid = (xid_t)INOTAG_TAG(DX_TAG_NFSD, cred.cr_uid, cred.cr_gid, 0); ++ new->xid = (vxid_t)INOTAG_TAG(DX_TAG_NFSD, cred.cr_uid, cred.cr_gid, 0); + */ rqgi = rqstp->rq_cred.cr_group_info; -diff -NurpP --minimal linux-3.7/fs/nfsd/nfs3xdr.c linux-3.7-vs2.3.5.1/fs/nfsd/nfs3xdr.c ---- linux-3.7/fs/nfsd/nfs3xdr.c 2012-05-21 16:07:26.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/nfsd/nfs3xdr.c 2012-12-11 15:56:32.000000000 +0000 -@@ -7,6 +7,7 @@ - */ +diff -urNp -x '*.orig' linux-4.9/fs/nfsd/nfs3xdr.c linux-4.9/fs/nfsd/nfs3xdr.c +--- linux-4.9/fs/nfsd/nfs3xdr.c 2021-02-24 15:47:32.300676089 +0100 ++++ linux-4.9/fs/nfsd/nfs3xdr.c 2021-02-24 15:47:45.077742470 +0100 +@@ -8,6 +8,7 @@ #include + #include +#include #include "xdr3.h" #include "auth.h" - -@@ -95,6 +96,8 @@ static __be32 * + #include "netns.h" +@@ -98,6 +99,8 @@ static __be32 * decode_sattr3(__be32 *p, struct iattr *iap) { u32 tmp; -+ uid_t uid = 0; -+ gid_t gid = 0; ++ kuid_t kuid = GLOBAL_ROOT_UID; ++ kgid_t kgid = GLOBAL_ROOT_GID; iap->ia_valid = 0; -@@ -104,12 +107,15 @@ decode_sattr3(__be32 *p, struct iattr *i +@@ -106,15 +109,18 @@ decode_sattr3(__be32 *p, struct iattr *i + iap->ia_mode = ntohl(*p++); } if (*p++) { - iap->ia_valid |= ATTR_UID; -- iap->ia_uid = ntohl(*p++); -+ uid = ntohl(*p++); +- iap->ia_uid = make_kuid(&init_user_ns, ntohl(*p++)); ++ kuid = make_kuid(&init_user_ns, ntohl(*p++)); + if (uid_valid(iap->ia_uid)) + iap->ia_valid |= ATTR_UID; } if (*p++) { - iap->ia_valid |= ATTR_GID; -- iap->ia_gid = ntohl(*p++); -+ gid = ntohl(*p++); +- iap->ia_gid = make_kgid(&init_user_ns, ntohl(*p++)); ++ kgid = make_kgid(&init_user_ns, ntohl(*p++)); + if (gid_valid(iap->ia_gid)) + iap->ia_valid |= ATTR_GID; } -+ iap->ia_uid = INOTAG_UID(DX_TAG_NFSD, uid, gid); -+ iap->ia_gid = INOTAG_GID(DX_TAG_NFSD, uid, gid); -+ iap->ia_tag = INOTAG_TAG(DX_TAG_NFSD, uid, gid, 0); ++ iap->ia_uid = INOTAG_KUID(DX_TAG_NFSD, kuid, kgid); ++ iap->ia_gid = INOTAG_KGID(DX_TAG_NFSD, kuid, kgid); ++ iap->ia_tag = INOTAG_KTAG(DX_TAG_NFSD, kuid, kgid, GLOBAL_ROOT_TAG); if (*p++) { u64 newsize; -@@ -165,8 +171,12 @@ encode_fattr3(struct svc_rqst *rqstp, __ +@@ -167,8 +173,12 @@ encode_fattr3(struct svc_rqst *rqstp, __ *p++ = htonl(nfs3_ftypes[(stat->mode & S_IFMT) >> 12]); - *p++ = htonl((u32) stat->mode); + *p++ = htonl((u32) (stat->mode & S_IALLUGO)); *p++ = htonl((u32) stat->nlink); -- *p++ = htonl((u32) nfsd_ruid(rqstp, stat->uid)); -- *p++ = htonl((u32) nfsd_rgid(rqstp, stat->gid)); -+ *p++ = htonl((u32) nfsd_ruid(rqstp, -+ TAGINO_UID(0 /* FIXME: DX_TAG(dentry->d_inode) */, +- *p++ = htonl((u32) from_kuid(&init_user_ns, stat->uid)); +- *p++ = htonl((u32) from_kgid(&init_user_ns, stat->gid)); ++ *p++ = htonl((u32) from_kuid(&init_user_ns, ++ TAGINO_KUID(0 /* FIXME: DX_TAG(dentry->d_inode) */, + stat->uid, stat->tag))); -+ *p++ = htonl((u32) nfsd_rgid(rqstp, -+ TAGINO_GID(0 /* FIXME: DX_TAG(dentry->d_inode) */, ++ *p++ = htonl((u32) from_kgid(&init_user_ns, ++ TAGINO_KGID(0 /* FIXME: DX_TAG(dentry->d_inode) */, + stat->gid, stat->tag))); if (S_ISLNK(stat->mode) && stat->size > NFS3_MAXPATHLEN) { p = xdr_encode_hyper(p, (u64) NFS3_MAXPATHLEN); } else { -diff -NurpP --minimal linux-3.7/fs/nfsd/nfs4xdr.c linux-3.7-vs2.3.5.1/fs/nfsd/nfs4xdr.c ---- linux-3.7/fs/nfsd/nfs4xdr.c 2012-12-11 15:47:35.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/nfsd/nfs4xdr.c 2012-12-11 15:56:32.000000000 +0000 -@@ -46,6 +46,7 @@ +diff -urNp -x '*.orig' linux-4.9/fs/nfsd/nfs4xdr.c linux-4.9/fs/nfsd/nfs4xdr.c +--- linux-4.9/fs/nfsd/nfs4xdr.c 2021-02-24 15:47:32.304009527 +0100 ++++ linux-4.9/fs/nfsd/nfs4xdr.c 2021-02-24 15:47:45.077742470 +0100 +@@ -40,6 +40,7 @@ #include #include #include @@ -5624,100 +5056,101 @@ diff -NurpP --minimal linux-3.7/fs/nfsd/nfs4xdr.c linux-3.7-vs2.3.5.1/fs/nfsd/nf #include "idmap.h" #include "acl.h" -@@ -2351,14 +2352,18 @@ out_acl: - WRITE32(stat.nlink); +@@ -2679,12 +2680,16 @@ out_acl: + *p++ = cpu_to_be32(stat.nlink); } if (bmval1 & FATTR4_WORD1_OWNER) { -- status = nfsd4_encode_user(rqstp, stat.uid, &p, &buflen); -+ status = nfsd4_encode_user(rqstp, -+ TAGINO_UID(DX_TAG(dentry->d_inode), -+ stat.uid, stat.tag), &p, &buflen); - if (status == nfserr_resource) - goto out_resource; +- status = nfsd4_encode_user(xdr, rqstp, stat.uid); ++ status = nfsd4_encode_user(xdr, rqstp, ++ TAGINO_KUID(DX_TAG(dentry->d_inode), ++ stat.uid, stat.tag)); if (status) goto out; } if (bmval1 & FATTR4_WORD1_OWNER_GROUP) { -- status = nfsd4_encode_group(rqstp, stat.gid, &p, &buflen); -+ status = nfsd4_encode_group(rqstp, -+ TAGINO_GID(DX_TAG(dentry->d_inode), -+ stat.gid, stat.tag), &p, &buflen); - if (status == nfserr_resource) - goto out_resource; +- status = nfsd4_encode_group(xdr, rqstp, stat.gid); ++ status = nfsd4_encode_group(xdr, rqstp, ++ TAGINO_KGID(DX_TAG(dentry->d_inode), ++ stat.gid, stat.tag)); if (status) -diff -NurpP --minimal linux-3.7/fs/nfsd/nfsxdr.c linux-3.7-vs2.3.5.1/fs/nfsd/nfsxdr.c ---- linux-3.7/fs/nfsd/nfsxdr.c 2011-05-22 14:17:53.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/nfsd/nfsxdr.c 2012-12-11 15:56:32.000000000 +0000 -@@ -6,6 +6,7 @@ - + goto out; + } +diff -urNp -x '*.orig' linux-4.9/fs/nfsd/nfsxdr.c linux-4.9/fs/nfsd/nfsxdr.c +--- linux-4.9/fs/nfsd/nfsxdr.c 2021-02-24 15:47:32.307342964 +0100 ++++ linux-4.9/fs/nfsd/nfsxdr.c 2021-02-24 15:47:45.077742470 +0100 +@@ -7,6 +7,7 @@ + #include "vfs.h" #include "xdr.h" #include "auth.h" +#include #define NFSDDBG_FACILITY NFSDDBG_XDR -@@ -88,6 +89,8 @@ static __be32 * +@@ -89,6 +90,8 @@ static __be32 * decode_sattr(__be32 *p, struct iattr *iap) { u32 tmp, tmp1; -+ uid_t uid = 0; -+ gid_t gid = 0; ++ kuid_t kuid = GLOBAL_ROOT_UID; ++ kgid_t kgid = GLOBAL_ROOT_GID; iap->ia_valid = 0; -@@ -101,12 +104,15 @@ decode_sattr(__be32 *p, struct iattr *ia +@@ -101,15 +104,18 @@ decode_sattr(__be32 *p, struct iattr *ia + iap->ia_mode = tmp; } if ((tmp = ntohl(*p++)) != (u32)-1) { - iap->ia_valid |= ATTR_UID; -- iap->ia_uid = tmp; -+ uid = tmp; +- iap->ia_uid = make_kuid(&init_user_ns, tmp); ++ kuid = make_kuid(&init_user_ns, tmp); + if (uid_valid(iap->ia_uid)) + iap->ia_valid |= ATTR_UID; } if ((tmp = ntohl(*p++)) != (u32)-1) { - iap->ia_valid |= ATTR_GID; -- iap->ia_gid = tmp; -+ gid = tmp; +- iap->ia_gid = make_kgid(&init_user_ns, tmp); ++ kgid = make_kgid(&init_user_ns, tmp); + if (gid_valid(iap->ia_gid)) + iap->ia_valid |= ATTR_GID; } -+ iap->ia_uid = INOTAG_UID(DX_TAG_NFSD, uid, gid); -+ iap->ia_gid = INOTAG_GID(DX_TAG_NFSD, uid, gid); -+ iap->ia_tag = INOTAG_TAG(DX_TAG_NFSD, uid, gid, 0); ++ iap->ia_uid = INOTAG_KUID(DX_TAG_NFSD, kuid, kgid); ++ iap->ia_gid = INOTAG_KGID(DX_TAG_NFSD, kuid, kgid); ++ iap->ia_tag = INOTAG_KTAG(DX_TAG_NFSD, kuid, kgid, GLOBAL_ROOT_TAG); if ((tmp = ntohl(*p++)) != (u32)-1) { iap->ia_valid |= ATTR_SIZE; iap->ia_size = tmp; -@@ -151,8 +157,10 @@ encode_fattr(struct svc_rqst *rqstp, __b +@@ -154,8 +160,10 @@ encode_fattr(struct svc_rqst *rqstp, __b *p++ = htonl(nfs_ftypes[type >> 12]); *p++ = htonl((u32) stat->mode); *p++ = htonl((u32) stat->nlink); -- *p++ = htonl((u32) nfsd_ruid(rqstp, stat->uid)); -- *p++ = htonl((u32) nfsd_rgid(rqstp, stat->gid)); -+ *p++ = htonl((u32) nfsd_ruid(rqstp, -+ TAGINO_UID(DX_TAG(dentry->d_inode), stat->uid, stat->tag))); -+ *p++ = htonl((u32) nfsd_rgid(rqstp, -+ TAGINO_GID(DX_TAG(dentry->d_inode), stat->gid, stat->tag))); +- *p++ = htonl((u32) from_kuid(&init_user_ns, stat->uid)); +- *p++ = htonl((u32) from_kgid(&init_user_ns, stat->gid)); ++ *p++ = htonl((u32) from_kuid(&init_user_ns, ++ TAGINO_KUID(DX_TAG(dentry->d_inode), stat->uid, stat->tag))); ++ *p++ = htonl((u32) from_kgid(&init_user_ns, ++ TAGINO_KGID(DX_TAG(dentry->d_inode), stat->gid, stat->tag))); if (S_ISLNK(type) && stat->size > NFS_MAXPATHLEN) { *p++ = htonl(NFS_MAXPATHLEN); -diff -NurpP --minimal linux-3.7/fs/ocfs2/dlmglue.c linux-3.7-vs2.3.5.1/fs/ocfs2/dlmglue.c ---- linux-3.7/fs/ocfs2/dlmglue.c 2012-07-22 21:39:41.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ocfs2/dlmglue.c 2012-12-11 15:56:32.000000000 +0000 -@@ -2047,6 +2047,7 @@ static void __ocfs2_stuff_meta_lvb(struc +diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/dlmglue.c linux-4.9/fs/ocfs2/dlmglue.c +--- linux-4.9/fs/ocfs2/dlmglue.c 2021-02-24 15:47:32.314009840 +0100 ++++ linux-4.9/fs/ocfs2/dlmglue.c 2021-02-24 15:47:45.077742470 +0100 +@@ -2120,6 +2120,7 @@ static void __ocfs2_stuff_meta_lvb(struc lvb->lvb_iclusters = cpu_to_be32(oi->ip_clusters); - lvb->lvb_iuid = cpu_to_be32(inode->i_uid); - lvb->lvb_igid = cpu_to_be32(inode->i_gid); -+ lvb->lvb_itag = cpu_to_be16(inode->i_tag); + lvb->lvb_iuid = cpu_to_be32(i_uid_read(inode)); + lvb->lvb_igid = cpu_to_be32(i_gid_read(inode)); ++ lvb->lvb_itag = cpu_to_be16(i_tag_read(inode)); lvb->lvb_imode = cpu_to_be16(inode->i_mode); lvb->lvb_inlink = cpu_to_be16(inode->i_nlink); lvb->lvb_iatime_packed = -@@ -2097,6 +2098,7 @@ static void ocfs2_refresh_inode_from_lvb +@@ -2170,6 +2171,7 @@ static void ocfs2_refresh_inode_from_lvb - inode->i_uid = be32_to_cpu(lvb->lvb_iuid); - inode->i_gid = be32_to_cpu(lvb->lvb_igid); -+ inode->i_tag = be16_to_cpu(lvb->lvb_itag); + i_uid_write(inode, be32_to_cpu(lvb->lvb_iuid)); + i_gid_write(inode, be32_to_cpu(lvb->lvb_igid)); ++ i_tag_write(inode, be16_to_cpu(lvb->lvb_itag)); inode->i_mode = be16_to_cpu(lvb->lvb_imode); set_nlink(inode, be16_to_cpu(lvb->lvb_inlink)); ocfs2_unpack_timespec(&inode->i_atime, -diff -NurpP --minimal linux-3.7/fs/ocfs2/dlmglue.h linux-3.7-vs2.3.5.1/fs/ocfs2/dlmglue.h ---- linux-3.7/fs/ocfs2/dlmglue.h 2010-10-21 11:07:50.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ocfs2/dlmglue.h 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/dlmglue.h linux-4.9/fs/ocfs2/dlmglue.h +--- linux-4.9/fs/ocfs2/dlmglue.h 2021-02-24 15:47:32.314009840 +0100 ++++ linux-4.9/fs/ocfs2/dlmglue.h 2021-02-24 15:47:45.077742470 +0100 @@ -46,7 +46,8 @@ struct ocfs2_meta_lvb { __be16 lvb_inlink; __be32 lvb_iattr; @@ -5728,10 +5161,10 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/dlmglue.h linux-3.7-vs2.3.5.1/fs/ocfs2/ }; #define OCFS2_QINFO_LVB_VERSION 1 -diff -NurpP --minimal linux-3.7/fs/ocfs2/file.c linux-3.7-vs2.3.5.1/fs/ocfs2/file.c ---- linux-3.7/fs/ocfs2/file.c 2012-12-11 15:47:35.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ocfs2/file.c 2012-12-11 15:56:32.000000000 +0000 -@@ -1123,7 +1123,7 @@ int ocfs2_setattr(struct dentry *dentry, +diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/file.c linux-4.9/fs/ocfs2/file.c +--- linux-4.9/fs/ocfs2/file.c 2021-02-24 15:47:32.314009840 +0100 ++++ linux-4.9/fs/ocfs2/file.c 2021-02-24 15:47:45.077742470 +0100 +@@ -1151,7 +1151,7 @@ int ocfs2_setattr(struct dentry *dentry, attr->ia_valid &= ~ATTR_SIZE; #define OCFS2_VALID_ATTRS (ATTR_ATIME | ATTR_MTIME | ATTR_CTIME | ATTR_SIZE \ @@ -5740,9 +5173,9 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/file.c linux-3.7-vs2.3.5.1/fs/ocfs2/fil if (!(attr->ia_valid & OCFS2_VALID_ATTRS)) return 0; -diff -NurpP --minimal linux-3.7/fs/ocfs2/inode.c linux-3.7-vs2.3.5.1/fs/ocfs2/inode.c ---- linux-3.7/fs/ocfs2/inode.c 2012-07-22 21:39:41.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ocfs2/inode.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/inode.c linux-4.9/fs/ocfs2/inode.c +--- linux-4.9/fs/ocfs2/inode.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/ocfs2/inode.c 2021-02-24 15:47:45.077742470 +0100 @@ -28,6 +28,7 @@ #include #include @@ -5751,7 +5184,7 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/inode.c linux-3.7-vs2.3.5.1/fs/ocfs2/in #include -@@ -78,11 +79,13 @@ void ocfs2_set_inode_flags(struct inode +@@ -87,11 +88,13 @@ void ocfs2_set_inode_flags(struct inode { unsigned int flags = OCFS2_I(inode)->ip_attr; @@ -5766,7 +5199,7 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/inode.c linux-3.7-vs2.3.5.1/fs/ocfs2/in if (flags & OCFS2_SYNC_FL) inode->i_flags |= S_SYNC; -@@ -92,25 +95,44 @@ void ocfs2_set_inode_flags(struct inode +@@ -101,25 +104,44 @@ void ocfs2_set_inode_flags(struct inode inode->i_flags |= S_NOATIME; if (flags & OCFS2_DIRSYNC_FL) inode->i_flags |= S_DIRSYNC; @@ -5815,7 +5248,7 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/inode.c linux-3.7-vs2.3.5.1/fs/ocfs2/in } struct inode *ocfs2_ilookup(struct super_block *sb, u64 blkno) -@@ -241,6 +263,8 @@ void ocfs2_populate_inode(struct inode * +@@ -278,6 +300,8 @@ void ocfs2_populate_inode(struct inode * struct super_block *sb; struct ocfs2_super *osb; int use_plocks = 1; @@ -5824,25 +5257,25 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/inode.c linux-3.7-vs2.3.5.1/fs/ocfs2/in sb = inode->i_sb; osb = OCFS2_SB(sb); -@@ -269,8 +293,12 @@ void ocfs2_populate_inode(struct inode * +@@ -306,8 +330,12 @@ void ocfs2_populate_inode(struct inode * inode->i_generation = le32_to_cpu(fe->i_generation); inode->i_rdev = huge_decode_dev(le64_to_cpu(fe->id1.dev1.i_rdev)); inode->i_mode = le16_to_cpu(fe->i_mode); -- inode->i_uid = le32_to_cpu(fe->i_uid); -- inode->i_gid = le32_to_cpu(fe->i_gid); +- i_uid_write(inode, le32_to_cpu(fe->i_uid)); +- i_gid_write(inode, le32_to_cpu(fe->i_gid)); + uid = le32_to_cpu(fe->i_uid); + gid = le32_to_cpu(fe->i_gid); -+ inode->i_uid = INOTAG_UID(DX_TAG(inode), uid, gid); -+ inode->i_gid = INOTAG_GID(DX_TAG(inode), uid, gid); -+ inode->i_tag = INOTAG_TAG(DX_TAG(inode), uid, gid, -+ /* le16_to_cpu(raw_inode->i_raw_tag)i */ 0); ++ i_uid_write(inode, INOTAG_UID(DX_TAG(inode), uid, gid)); ++ i_gid_write(inode, INOTAG_GID(DX_TAG(inode), uid, gid)); ++ i_tag_write(inode, INOTAG_TAG(DX_TAG(inode), uid, gid, ++ /* le16_to_cpu(raw_inode->i_raw_tag) */ 0)); /* Fast symlinks will have i_size but no allocated clusters. */ if (S_ISLNK(inode->i_mode) && !fe->i_clusters) { -diff -NurpP --minimal linux-3.7/fs/ocfs2/inode.h linux-3.7-vs2.3.5.1/fs/ocfs2/inode.h ---- linux-3.7/fs/ocfs2/inode.h 2012-01-09 15:14:55.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ocfs2/inode.h 2012-12-11 15:56:32.000000000 +0000 -@@ -154,6 +154,7 @@ struct buffer_head *ocfs2_bread(struct i +diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/inode.h linux-4.9/fs/ocfs2/inode.h +--- linux-4.9/fs/ocfs2/inode.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/ocfs2/inode.h 2021-02-24 15:47:45.077742470 +0100 +@@ -155,6 +155,7 @@ int ocfs2_mark_inode_dirty(handle_t *han void ocfs2_set_inode_flags(struct inode *inode); void ocfs2_get_inode_flags(struct ocfs2_inode_info *oi); @@ -5850,9 +5283,9 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/inode.h linux-3.7-vs2.3.5.1/fs/ocfs2/in static inline blkcnt_t ocfs2_inode_sector_count(struct inode *inode) { -diff -NurpP --minimal linux-3.7/fs/ocfs2/ioctl.c linux-3.7-vs2.3.5.1/fs/ocfs2/ioctl.c ---- linux-3.7/fs/ocfs2/ioctl.c 2012-10-04 13:27:41.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ocfs2/ioctl.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/ioctl.c linux-4.9/fs/ocfs2/ioctl.c +--- linux-4.9/fs/ocfs2/ioctl.c 2021-02-24 15:47:32.314009840 +0100 ++++ linux-4.9/fs/ocfs2/ioctl.c 2021-02-24 15:47:45.077742470 +0100 @@ -76,7 +76,41 @@ static int ocfs2_get_inode_attr(struct i return status; } @@ -5896,9 +5329,9 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/ioctl.c linux-3.7-vs2.3.5.1/fs/ocfs2/io unsigned mask) { struct ocfs2_inode_info *ocfs2_inode = OCFS2_I(inode); -@@ -101,6 +135,11 @@ static int ocfs2_set_inode_attr(struct i - if (!S_ISDIR(inode->i_mode)) - flags &= ~OCFS2_DIRSYNC_FL; +@@ -116,6 +150,11 @@ static int ocfs2_set_inode_attr(struct i + goto bail_unlock; + } + if (IS_BARRIER(inode)) { + vxwprintk_task(1, "messing with the barrier."); @@ -5908,17 +5341,17 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/ioctl.c linux-3.7-vs2.3.5.1/fs/ocfs2/io handle = ocfs2_start_trans(osb, OCFS2_INODE_UPDATE_CREDITS); if (IS_ERR(handle)) { status = PTR_ERR(handle); -@@ -879,6 +918,7 @@ bail: +@@ -839,6 +878,7 @@ bail: return status; } + long ocfs2_ioctl(struct file *filp, unsigned int cmd, unsigned long arg) { - struct inode *inode = filp->f_path.dentry->d_inode; -diff -NurpP --minimal linux-3.7/fs/ocfs2/namei.c linux-3.7-vs2.3.5.1/fs/ocfs2/namei.c ---- linux-3.7/fs/ocfs2/namei.c 2012-10-04 13:27:41.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ocfs2/namei.c 2012-12-11 15:56:32.000000000 +0000 + struct inode *inode = file_inode(filp); +diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/namei.c linux-4.9/fs/ocfs2/namei.c +--- linux-4.9/fs/ocfs2/namei.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/ocfs2/namei.c 2021-02-24 15:47:45.081075908 +0100 @@ -41,6 +41,7 @@ #include #include @@ -5927,43 +5360,45 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/namei.c linux-3.7-vs2.3.5.1/fs/ocfs2/na #include -@@ -475,6 +476,7 @@ static int __ocfs2_mknod_locked(struct i - struct ocfs2_dinode *fe = NULL; +@@ -516,6 +517,7 @@ static int __ocfs2_mknod_locked(struct i struct ocfs2_extent_list *fel; u16 feat; -+ tag_t tag; + struct ocfs2_inode_info *oi = OCFS2_I(inode); ++ ktag_t ktag; *new_fe_bh = NULL; -@@ -512,8 +514,11 @@ static int __ocfs2_mknod_locked(struct i +@@ -553,8 +555,13 @@ static int __ocfs2_mknod_locked(struct i fe->i_suballoc_loc = cpu_to_le64(suballoc_loc); fe->i_suballoc_bit = cpu_to_le16(suballoc_bit); fe->i_suballoc_slot = cpu_to_le16(inode_ac->ac_alloc_slot); -- fe->i_uid = cpu_to_le32(inode->i_uid); -- fe->i_gid = cpu_to_le32(inode->i_gid); -+ -+ tag = dx_current_fstag(osb->sb); -+ fe->i_uid = cpu_to_le32(TAGINO_UID(DX_TAG(inode), inode->i_uid, tag)); -+ fe->i_gid = cpu_to_le32(TAGINO_GID(DX_TAG(inode), inode->i_gid, tag)); -+ inode->i_tag = tag; +- fe->i_uid = cpu_to_le32(i_uid_read(inode)); +- fe->i_gid = cpu_to_le32(i_gid_read(inode)); ++ ++ ktag = make_ktag(&init_user_ns, dx_current_fstag(osb->sb)); ++ fe->i_uid = cpu_to_le32(from_kuid(&init_user_ns, ++ TAGINO_KUID(DX_TAG(inode), inode->i_uid, ktag))); ++ fe->i_gid = cpu_to_le32(from_kgid(&init_user_ns, ++ TAGINO_KGID(DX_TAG(inode), inode->i_gid, ktag))); ++ inode->i_tag = ktag; /* is this correct? */ fe->i_mode = cpu_to_le16(inode->i_mode); if (S_ISCHR(inode->i_mode) || S_ISBLK(inode->i_mode)) fe->id1.dev1.i_rdev = cpu_to_le64(huge_encode_dev(dev)); -diff -NurpP --minimal linux-3.7/fs/ocfs2/ocfs2.h linux-3.7-vs2.3.5.1/fs/ocfs2/ocfs2.h ---- linux-3.7/fs/ocfs2/ocfs2.h 2012-01-09 15:14:55.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ocfs2/ocfs2.h 2012-12-11 15:56:32.000000000 +0000 -@@ -272,6 +272,7 @@ enum ocfs2_mount_options - writes */ - OCFS2_MOUNT_HB_NONE = 1 << 13, /* No heartbeat */ - OCFS2_MOUNT_HB_GLOBAL = 1 << 14, /* Global heartbeat */ -+ OCFS2_MOUNT_TAGGED = 1 << 15, /* use tagging */ +diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/ocfs2.h linux-4.9/fs/ocfs2/ocfs2.h +--- linux-4.9/fs/ocfs2/ocfs2.h 2021-02-24 15:47:32.317343277 +0100 ++++ linux-4.9/fs/ocfs2/ocfs2.h 2021-02-24 15:47:45.081075908 +0100 +@@ -289,6 +289,7 @@ enum ocfs2_mount_options + OCFS2_MOUNT_JOURNAL_ASYNC_COMMIT = 1 << 15, /* Journal Async Commit */ + OCFS2_MOUNT_ERRORS_CONT = 1 << 16, /* Return EIO to the calling process on error */ + OCFS2_MOUNT_ERRORS_ROFS = 1 << 17, /* Change filesystem to read-only on error */ ++ OCFS2_MOUNT_TAGGED = 1 << 18, /* use tagging */ }; - #define OCFS2_OSB_SOFT_RO 0x0001 -diff -NurpP --minimal linux-3.7/fs/ocfs2/ocfs2_fs.h linux-3.7-vs2.3.5.1/fs/ocfs2/ocfs2_fs.h ---- linux-3.7/fs/ocfs2/ocfs2_fs.h 2011-05-22 14:17:53.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ocfs2/ocfs2_fs.h 2012-12-11 15:56:32.000000000 +0000 -@@ -266,6 +266,11 @@ + #define OCFS2_OSB_SOFT_RO 0x0001 +diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/ocfs2_fs.h linux-4.9/fs/ocfs2/ocfs2_fs.h +--- linux-4.9/fs/ocfs2/ocfs2_fs.h 2021-02-24 15:47:32.317343277 +0100 ++++ linux-4.9/fs/ocfs2/ocfs2_fs.h 2021-02-24 15:47:45.081075908 +0100 +@@ -275,6 +275,11 @@ #define OCFS2_TOPDIR_FL FS_TOPDIR_FL /* Top of directory hierarchies*/ #define OCFS2_RESERVED_FL FS_RESERVED_FL /* reserved for ext2 lib */ @@ -5975,28 +5410,28 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/ocfs2_fs.h linux-3.7-vs2.3.5.1/fs/ocfs2 #define OCFS2_FL_VISIBLE FS_FL_USER_VISIBLE /* User visible flags */ #define OCFS2_FL_MODIFIABLE FS_FL_USER_MODIFIABLE /* User modifiable flags */ -diff -NurpP --minimal linux-3.7/fs/ocfs2/super.c linux-3.7-vs2.3.5.1/fs/ocfs2/super.c ---- linux-3.7/fs/ocfs2/super.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/ocfs2/super.c 2012-12-11 15:56:32.000000000 +0000 -@@ -185,6 +185,7 @@ enum { - Opt_coherency_full, - Opt_resv_level, +diff -urNp -x '*.orig' linux-4.9/fs/ocfs2/super.c linux-4.9/fs/ocfs2/super.c +--- linux-4.9/fs/ocfs2/super.c 2021-02-24 15:47:32.317343277 +0100 ++++ linux-4.9/fs/ocfs2/super.c 2021-02-24 15:47:45.081075908 +0100 +@@ -188,6 +188,7 @@ enum { Opt_dir_resv_level, + Opt_journal_async_commit, + Opt_err_cont, + Opt_tag, Opt_notag, Opt_tagid, Opt_err, }; -@@ -216,6 +217,9 @@ static const match_table_t tokens = { - {Opt_coherency_full, "coherency=full"}, - {Opt_resv_level, "resv_level=%u"}, +@@ -221,6 +222,9 @@ static const match_table_t tokens = { {Opt_dir_resv_level, "dir_resv_level=%u"}, + {Opt_journal_async_commit, "journal_async_commit"}, + {Opt_err_cont, "errors=continue"}, + {Opt_tag, "tag"}, + {Opt_notag, "notag"}, + {Opt_tagid, "tagid=%u"}, {Opt_err, NULL} }; -@@ -662,6 +666,13 @@ static int ocfs2_remount(struct super_bl +@@ -672,6 +676,13 @@ static int ocfs2_remount(struct super_bl goto out; } @@ -6010,7 +5445,7 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/super.c linux-3.7-vs2.3.5.1/fs/ocfs2/su /* We're going to/from readonly mode. */ if ((*flags & MS_RDONLY) != (sb->s_flags & MS_RDONLY)) { /* Disable quota accounting before remounting RO */ -@@ -1177,6 +1188,9 @@ static int ocfs2_fill_super(struct super +@@ -1161,6 +1172,9 @@ static int ocfs2_fill_super(struct super ocfs2_complete_mount_recovery(osb); @@ -6020,9 +5455,9 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/super.c linux-3.7-vs2.3.5.1/fs/ocfs2/su if (ocfs2_mount_local(osb)) snprintf(nodestr, sizeof(nodestr), "local"); else -@@ -1503,6 +1517,20 @@ static int ocfs2_parse_options(struct su - option < OCFS2_MAX_RESV_LEVEL) - mopt->dir_resv_level = option; +@@ -1480,6 +1494,20 @@ static int ocfs2_parse_options(struct su + case Opt_journal_async_commit: + mopt->mount_opt |= OCFS2_MOUNT_JOURNAL_ASYNC_COMMIT; break; +#ifndef CONFIG_TAGGING_NONE + case Opt_tag: @@ -6041,13 +5476,13 @@ diff -NurpP --minimal linux-3.7/fs/ocfs2/super.c linux-3.7-vs2.3.5.1/fs/ocfs2/su default: mlog(ML_ERROR, "Unrecognized mount option \"%s\" " -diff -NurpP --minimal linux-3.7/fs/open.c linux-3.7-vs2.3.5.1/fs/open.c ---- linux-3.7/fs/open.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/open.c 2012-12-11 15:56:32.000000000 +0000 -@@ -30,6 +30,11 @@ - #include +diff -urNp -x '*.orig' linux-4.9/fs/open.c linux-4.9/fs/open.c +--- linux-4.9/fs/open.c 2021-02-24 15:47:32.320676715 +0100 ++++ linux-4.9/fs/open.c 2021-02-24 15:47:45.081075908 +0100 +@@ -31,6 +31,11 @@ #include #include + #include +#include +#include +#include @@ -6056,114 +5491,121 @@ diff -NurpP --minimal linux-3.7/fs/open.c linux-3.7-vs2.3.5.1/fs/open.c #include "internal.h" -@@ -74,6 +79,12 @@ static long do_sys_truncate(const char _ - error = user_path(pathname, &path); - if (error) - goto out; -+ -+#ifdef CONFIG_VSERVER_COWBL -+ error = cow_check_and_break(&path); +@@ -65,12 +70,17 @@ int do_truncate(struct dentry *dentry, l + return ret; + } + +-long vfs_truncate(const struct path *path, loff_t length) ++long vfs_truncate(struct path *path, loff_t length) + { + struct inode *inode; + struct dentry *upperdentry; + long error; + ++#ifdef CONFIG_VSERVER_COWBL ++ error = cow_check_and_break(path); + if (error) -+ goto dput_and_out; ++ goto out; +#endif - inode = path.dentry->d_inode; + inode = path->dentry->d_inode; /* For directories it's -EISDIR, for other non-regulars - -EINVAL */ -@@ -492,6 +503,10 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons - - error = user_path_at(dfd, filename, LOOKUP_FOLLOW, &path); - if (!error) { +@@ -584,6 +594,13 @@ SYSCALL_DEFINE3(fchmodat, int, dfd, cons + unsigned int lookup_flags = LOOKUP_FOLLOW; + retry: + error = user_path_at(dfd, filename, lookup_flags, &path); +#ifdef CONFIG_VSERVER_COWBL ++ if (!error) { + error = cow_check_and_break(&path); -+ if (!error) ++ if (error) ++ path_put(&path); ++ } +#endif + if (!error) { error = chmod_common(&path, mode); path_put(&path); - } -@@ -519,13 +534,13 @@ static int chown_common(struct path *pat +@@ -618,13 +635,15 @@ retry_deleg: if (!uid_valid(uid)) return -EINVAL; newattrs.ia_valid |= ATTR_UID; - newattrs.ia_uid = uid; -+ newattrs.ia_uid = dx_map_uid(user); ++ newattrs.ia_uid = make_kuid(&init_user_ns, ++ dx_map_uid(user)); } if (group != (gid_t) -1) { if (!gid_valid(gid)) return -EINVAL; newattrs.ia_valid |= ATTR_GID; - newattrs.ia_gid = gid; -+ newattrs.ia_gid = dx_map_gid(group); ++ newattrs.ia_gid = make_kgid(&init_user_ns, ++ dx_map_gid(group)); } if (!S_ISDIR(inode->i_mode)) newattrs.ia_valid |= -@@ -558,6 +573,18 @@ SYSCALL_DEFINE5(fchownat, int, dfd, cons +@@ -662,6 +681,10 @@ retry: error = mnt_want_write(path.mnt); if (error) goto out_release; +#ifdef CONFIG_VSERVER_COWBL + error = cow_check_and_break(&path); + if (!error) -+#endif -+#ifdef CONFIG_VSERVER_COWBL -+ error = cow_check_and_break(&path); -+ if (!error) -+#endif -+#ifdef CONFIG_VSERVER_COWBL -+ error = cow_check_and_break(&path); -+ if (!error) +#endif error = chown_common(&path, user, group); mnt_drop_write(path.mnt); out_release: -diff -NurpP --minimal linux-3.7/fs/proc/array.c linux-3.7-vs2.3.5.1/fs/proc/array.c ---- linux-3.7/fs/proc/array.c 2012-07-22 21:39:42.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/proc/array.c 2012-12-11 15:56:32.000000000 +0000 -@@ -82,6 +82,8 @@ - #include - #include +diff -urNp -x '*.orig' linux-4.9/fs/proc/array.c linux-4.9/fs/proc/array.c +--- linux-4.9/fs/proc/array.c 2021-02-24 15:47:32.324010153 +0100 ++++ linux-4.9/fs/proc/array.c 2021-02-24 15:47:45.081075908 +0100 +@@ -86,6 +86,8 @@ + #include #include + #include +#include +#include #include #include -@@ -172,6 +174,9 @@ static inline void task_state(struct seq - rcu_read_lock(); +@@ -170,6 +172,9 @@ static inline void task_state(struct seq ppid = pid_alive(p) ? task_tgid_nr_ns(rcu_dereference(p->real_parent), ns) : 0; + + if (unlikely(vx_current_initpid(p->pid))) + ppid = 0; + - tpid = 0; - if (pid_alive(p)) { - struct task_struct *tracer = ptrace_parent(p); -@@ -296,7 +301,7 @@ static inline void task_sig(struct seq_f + tracer = ptrace_parent(p); + if (tracer) + tpid = task_pid_nr_ns(tracer, ns); +@@ -307,8 +312,8 @@ static inline void task_sig(struct seq_f + render_sigset_t(m, "SigCgt:\t", &caught); } - static void render_cap_t(struct seq_file *m, const char *header, +-static void render_cap_t(struct seq_file *m, const char *header, - kernel_cap_t *a) ++void render_cap_t(struct seq_file *m, const char *header, + struct vx_info *vxi, kernel_cap_t *a) { unsigned __capi; -@@ -321,10 +326,11 @@ static inline void task_cap(struct seq_f - cap_bset = cred->cap_bset; +@@ -335,11 +340,12 @@ static inline void task_cap(struct seq_f + cap_ambient = cred->cap_ambient; rcu_read_unlock(); - render_cap_t(m, "CapInh:\t", &cap_inheritable); - render_cap_t(m, "CapPrm:\t", &cap_permitted); - render_cap_t(m, "CapEff:\t", &cap_effective); - render_cap_t(m, "CapBnd:\t", &cap_bset); +- render_cap_t(m, "CapAmb:\t", &cap_ambient); + /* FIXME: maybe move the p->vx_info masking to __task_cred() ? */ + render_cap_t(m, "CapInh:\t", p->vx_info, &cap_inheritable); + render_cap_t(m, "CapPrm:\t", p->vx_info, &cap_permitted); + render_cap_t(m, "CapEff:\t", p->vx_info, &cap_effective); + render_cap_t(m, "CapBnd:\t", p->vx_info, &cap_bset); ++ render_cap_t(m, "CapAmb:\t", p->vx_info, &cap_ambient); } - static inline void task_context_switch_counts(struct seq_file *m, -@@ -346,6 +352,42 @@ static void task_cpus_allowed(struct seq - seq_putc(m, '\n'); + static inline void task_seccomp(struct seq_file *m, struct task_struct *p) +@@ -391,6 +397,43 @@ static void task_cpus_allowed(struct seq + cpumask_pr_args(&task->cpus_allowed)); } +int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns, @@ -6185,8 +5627,9 @@ diff -NurpP --minimal linux-3.7/fs/proc/array.c linux-3.7-vs2.3.5.1/fs/proc/arra + (task->nsproxy->ipc_ns == init_task.nsproxy->ipc_ns ? 'I' : '-'), + task->nsproxy->mnt_ns, + (task->nsproxy->mnt_ns == init_task.nsproxy->mnt_ns ? 'I' : '-'), -+ task->nsproxy->pid_ns, -+ (task->nsproxy->pid_ns == init_task.nsproxy->pid_ns ? 'I' : '-'), ++ task->nsproxy->pid_ns_for_children, ++ (task->nsproxy->pid_ns_for_children == ++ init_task.nsproxy->pid_ns_for_children ? 'I' : '-'), + task->nsproxy->net_ns, + (task->nsproxy->net_ns == init_task.nsproxy->net_ns ? 'I' : '-')); + return 0; @@ -6197,25 +5640,25 @@ diff -NurpP --minimal linux-3.7/fs/proc/array.c linux-3.7-vs2.3.5.1/fs/proc/arra + if (task_vx_flags(task, VXF_HIDE_VINFO, 0)) + return; + -+ seq_printf(m, "VxID: %d\n", vx_task_xid(task)); -+ seq_printf(m, "NxID: %d\n", nx_task_nid(task)); ++ seq_printf(m, "VxID:\t%d\n", vx_task_xid(task)); ++ seq_printf(m, "NxID:\t%d\n", nx_task_nid(task)); +} + + int proc_pid_status(struct seq_file *m, struct pid_namespace *ns, struct pid *pid, struct task_struct *task) { -@@ -362,6 +404,7 @@ int proc_pid_status(struct seq_file *m, - task_cap(m, task); +@@ -408,6 +451,7 @@ int proc_pid_status(struct seq_file *m, + task_seccomp(m, task); task_cpus_allowed(m, task); cpuset_task_status_allowed(m, task); + task_vs_id(m, task); task_context_switch_counts(m, task); return 0; } -@@ -471,6 +514,17 @@ static int do_task_stat(struct seq_file +@@ -523,6 +567,17 @@ static int do_task_stat(struct seq_file /* convert nsec -> ticks */ - start_time = nsec_to_clock_t(start_time); + start_time = nsec_to_clock_t(task->real_start_time); + /* fixup start time for virt uptime */ + if (vx_flags(VXF_VIRT_UPTIME, 0)) { @@ -6229,77 +5672,76 @@ diff -NurpP --minimal linux-3.7/fs/proc/array.c linux-3.7-vs2.3.5.1/fs/proc/arra + } + seq_printf(m, "%d (%s) %c", pid_nr_ns(pid, ns), tcomm, state); - seq_put_decimal_ll(m, ' ', ppid); - seq_put_decimal_ll(m, ' ', pgid); -diff -NurpP --minimal linux-3.7/fs/proc/base.c linux-3.7-vs2.3.5.1/fs/proc/base.c ---- linux-3.7/fs/proc/base.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/proc/base.c 2012-12-11 19:34:49.000000000 +0000 -@@ -85,6 +85,8 @@ - #include + seq_put_decimal_ll(m, " ", ppid); + seq_put_decimal_ll(m, " ", pgid); +diff -urNp -x '*.orig' linux-4.9/fs/proc/base.c linux-4.9/fs/proc/base.c +--- linux-4.9/fs/proc/base.c 2021-02-24 15:47:32.324010153 +0100 ++++ linux-4.9/fs/proc/base.c 2021-02-24 15:47:45.081075908 +0100 +@@ -87,6 +87,8 @@ #include #include + #include +#include +#include #ifdef CONFIG_HARDWALL #include #endif -@@ -950,11 +952,15 @@ static ssize_t oom_adj_write(struct file - oom_adj = (oom_adj * OOM_SCORE_ADJ_MAX) / -OOM_DISABLE; - - if (oom_adj < task->signal->oom_score_adj && -- !capable(CAP_SYS_RESOURCE)) { -+ !vx_capable(CAP_SYS_RESOURCE, VXC_OOM_ADJUST)) { - err = -EACCES; - goto err_sighand; - } - -+ /* prevent guest processes from circumventing the oom killer */ -+ if (vx_current_xid() && (oom_adj == OOM_DISABLE)) -+ oom_adj = OOM_ADJUST_MIN; +@@ -1079,10 +1081,15 @@ static int __set_oom_adj(struct file *fi + mutex_lock(&oom_adj_mutex); + if (legacy) { + if (oom_adj < task->signal->oom_score_adj && +- !capable(CAP_SYS_RESOURCE)) { ++ !vx_capable(CAP_SYS_RESOURCE, VXC_OOM_ADJUST)) { + err = -EACCES; + goto err_unlock; + } + - /* - * /proc/pid/oom_adj is provided for legacy purposes, ask users to use - * /proc/pid/oom_score_adj instead. -@@ -1534,6 +1540,8 @@ struct inode *proc_pid_make_inode(struct ++ /* prevent guest processes from circumventing the oom killer */ ++ if (vx_current_xid() && (oom_adj == OOM_DISABLE)) ++ oom_adj = OOM_ADJUST_MIN; ++ + /* + * /proc/pid/oom_adj is provided for legacy purposes, ask users to use + * /proc/pid/oom_score_adj instead. +@@ -1708,6 +1715,8 @@ struct inode *proc_pid_make_inode(struct inode->i_gid = cred->egid; rcu_read_unlock(); } + /* procfs is xid tagged */ -+ i_tag_write(inode, (tag_t)vx_task_xid(task)); ++ i_tag_write(inode, (vtag_t)vx_task_xid(task)); security_task_to_inode(task, inode); out: -@@ -1579,6 +1587,8 @@ int pid_getattr(struct vfsmount *mnt, st +@@ -1753,6 +1762,8 @@ int pid_getattr(struct vfsmount *mnt, st /* dentry stuff */ -+static unsigned name_to_int(struct dentry *dentry); ++// static unsigned name_to_int(struct dentry *dentry); + /* * Exceptional case: normally we are not allowed to unhash a busy * directory. In this case, however, we can do it - no aliasing problems -@@ -1607,6 +1617,12 @@ int pid_revalidate(struct dentry *dentry +@@ -1781,6 +1792,19 @@ int pid_revalidate(struct dentry *dentry task = get_proc_task(inode); if (task) { -+ unsigned pid = name_to_int(dentry); -+ -+ if (pid != ~0U && pid != vx_map_pid(task->pid)) { ++ unsigned pid = name_to_int(&dentry->d_name); ++ ++ if (pid != ~0U && pid != vx_map_pid(task->pid) && ++ pid != __task_pid_nr_ns(task, PIDTYPE_PID, ++ task_active_pid_ns(task))) { ++ vxdprintk(VXD_CBIT(misc, 10), ++ VS_Q("%*s") " dropped by pid_revalidate(%d!=%d)", ++ dentry->d_name.len, dentry->d_name.name, ++ pid, vx_map_pid(task->pid)); + put_task_struct(task); -+ goto drop; ++ d_drop(dentry); ++ return 0; + } if ((inode->i_mode == (S_IFDIR|S_IRUGO|S_IXUGO)) || task_dumpable(task)) { rcu_read_lock(); -@@ -1623,6 +1639,7 @@ int pid_revalidate(struct dentry *dentry - put_task_struct(task); - return 1; - } -+drop: - d_drop(dentry); - return 0; - } -@@ -2065,6 +2082,13 @@ static struct dentry *proc_pident_lookup +@@ -2445,6 +2469,13 @@ static struct dentry *proc_pident_lookup if (!task) goto out_no_task; @@ -6313,43 +5755,28 @@ diff -NurpP --minimal linux-3.7/fs/proc/base.c linux-3.7-vs2.3.5.1/fs/proc/base. /* * Yes, it does not scale. And it should not. Don't add * new entries into /proc// without very good reasons. -@@ -2451,7 +2475,7 @@ out_iput: - static struct dentry *proc_base_lookup(struct inode *dir, struct dentry *dentry) - { - struct dentry *error; -- struct task_struct *task = get_proc_task(dir); -+ struct task_struct *task = get_proc_task_real(dir); - const struct pid_entry *p, *last; - - error = ERR_PTR(-ENOENT); -@@ -2639,6 +2663,9 @@ static int proc_pid_personality(struct s +@@ -2884,6 +2915,11 @@ static int proc_pid_personality(struct s static const struct file_operations proc_task_operations; static const struct inode_operations proc_task_inode_operations; -+extern int proc_pid_vx_info(struct task_struct *, char *); -+extern int proc_pid_nx_info(struct task_struct *, char *); ++extern int proc_pid_vx_info(struct seq_file *, ++ struct pid_namespace *, struct pid *, struct task_struct *); ++extern int proc_pid_nx_info(struct seq_file *, ++ struct pid_namespace *, struct pid *, struct task_struct *); + static const struct pid_entry tgid_base_stuff[] = { DIR("task", S_IRUGO|S_IXUGO, proc_task_inode_operations, proc_task_operations), DIR("fd", S_IRUSR|S_IXUSR, proc_fd_inode_operations, proc_fd_operations), -@@ -2705,6 +2732,8 @@ static const struct pid_entry tgid_base_ +@@ -2948,6 +2984,8 @@ static const struct pid_entry tgid_base_ #ifdef CONFIG_CGROUPS - REG("cgroup", S_IRUGO, proc_cgroup_operations), + ONE("cgroup", S_IRUGO, proc_cgroup_show), #endif -+ INF("vinfo", S_IRUGO, proc_pid_vx_info), -+ INF("ninfo", S_IRUGO, proc_pid_nx_info), - INF("oom_score", S_IRUGO, proc_oom_score), ++ ONE("vinfo", S_IRUGO, proc_pid_vx_info), ++ ONE("ninfo", S_IRUGO, proc_pid_nx_info), + ONE("oom_score", S_IRUGO, proc_oom_score), REG("oom_adj", S_IRUGO|S_IWUSR, proc_oom_adj_operations), REG("oom_score_adj", S_IRUGO|S_IWUSR, proc_oom_score_adj_operations), -@@ -2729,6 +2758,7 @@ static const struct pid_entry tgid_base_ - REG("gid_map", S_IRUGO|S_IWUSR, proc_gid_map_operations), - REG("projid_map", S_IRUGO|S_IWUSR, proc_projid_map_operations), - #endif -+ ONE("nsproxy", S_IRUGO, proc_pid_nsproxy), - }; - - static int proc_tgid_base_readdir(struct file * filp, -@@ -2923,7 +2953,7 @@ retry: +@@ -3163,7 +3201,7 @@ retry: iter.task = NULL; pid = find_ge_pid(iter.tgid, ns); if (pid) { @@ -6358,35 +5785,28 @@ diff -NurpP --minimal linux-3.7/fs/proc/base.c linux-3.7-vs2.3.5.1/fs/proc/base. iter.task = pid_task(pid, PIDTYPE_PID); /* What we to know is if the pid we have find is the * pid of a thread_group_leader. Testing for task -@@ -2953,7 +2983,7 @@ static int proc_pid_fill_cache(struct fi - struct tgid_iter iter) - { - char name[PROC_NUMBUF]; -- int len = snprintf(name, sizeof(name), "%d", iter.tgid); -+ int len = snprintf(name, sizeof(name), "%d", vx_map_tgid(iter.tgid)); - return proc_fill_cache(filp, dirent, filldir, name, len, - proc_pid_instantiate, iter.task, NULL); - } -@@ -2977,7 +3007,7 @@ int proc_pid_readdir(struct file * filp, - goto out_no_task; - nr = filp->f_pos - FIRST_PROCESS_ENTRY; - -- reaper = get_proc_task(filp->f_path.dentry->d_inode); -+ reaper = get_proc_task_real(filp->f_path.dentry->d_inode); - if (!reaper) - goto out_no_task; - -@@ -2999,6 +3029,8 @@ int proc_pid_readdir(struct file * filp, - __filldir = fake_filldir; +@@ -3223,8 +3261,10 @@ int proc_pid_readdir(struct file *file, + if (!has_pid_permissions(ns, iter.task, 2)) + continue; - filp->f_pos = iter.tgid + TGID_OFFSET; +- len = snprintf(name, sizeof(name), "%d", iter.tgid); ++ len = snprintf(name, sizeof(name), "%d", vx_map_tgid(iter.tgid)); + ctx->pos = iter.tgid + TGID_OFFSET; + if (!vx_proc_task_visible(iter.task)) + continue; - if (proc_pid_fill_cache(filp, dirent, __filldir, iter) < 0) { + if (!proc_fill_cache(file, ctx, name, len, + proc_pid_instantiate, iter.task, NULL)) { put_task_struct(iter.task); - goto out; -@@ -3161,6 +3193,8 @@ static struct dentry *proc_task_lookup(s - tid = name_to_int(dentry); +@@ -3361,6 +3401,7 @@ static const struct pid_entry tid_base_s + REG("projid_map", S_IRUGO|S_IWUSR, proc_projid_map_operations), + REG("setgroups", S_IRUGO|S_IWUSR, proc_setgroups_operations), + #endif ++ ONE("nsproxy", S_IRUGO, proc_pid_nsproxy), + }; + + static int proc_tid_base_readdir(struct file *file, struct dir_context *ctx) +@@ -3427,6 +3468,8 @@ static struct dentry *proc_task_lookup(s + tid = name_to_int(&dentry->d_name); if (tid == ~0U) goto out; + if (vx_current_initpid(tid)) @@ -6394,9 +5814,9 @@ diff -NurpP --minimal linux-3.7/fs/proc/base.c linux-3.7-vs2.3.5.1/fs/proc/base. ns = dentry->d_sb->s_fs_info; rcu_read_lock(); -diff -NurpP --minimal linux-3.7/fs/proc/generic.c linux-3.7-vs2.3.5.1/fs/proc/generic.c ---- linux-3.7/fs/proc/generic.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/proc/generic.c 2012-12-11 19:15:21.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/proc/generic.c linux-4.9/fs/proc/generic.c +--- linux-4.9/fs/proc/generic.c 2021-02-24 15:47:32.324010153 +0100 ++++ linux-4.9/fs/proc/generic.c 2021-02-24 15:47:45.081075908 +0100 @@ -22,6 +22,7 @@ #include #include @@ -6405,48 +5825,63 @@ diff -NurpP --minimal linux-3.7/fs/proc/generic.c linux-3.7-vs2.3.5.1/fs/proc/ge #include #include "internal.h" -@@ -424,11 +425,15 @@ struct dentry *proc_lookup_de(struct pro - for (de = de->subdir; de ; de = de->next) { - if (de->namelen != dentry->d_name.len) - continue; -+ if (!vx_hide_check(0, de->vx_flags)) -+ continue; - if (!memcmp(dentry->d_name.name, de->name, de->namelen)) { - pde_get(de); - spin_unlock(&proc_subdir_lock); - error = -ENOMEM; - inode = proc_get_inode(dir->i_sb, de); +@@ -66,8 +67,16 @@ static struct proc_dir_entry *pde_subdir + node = node->rb_left; + else if (result > 0) + node = node->rb_right; +- else ++ else { ++ if (!vx_hide_check(0, de->vx_flags)) { ++ vxdprintk(VXD_CBIT(misc, 9), ++ VS_Q("%*s") ++ " hidden in pde_subdir_find()", ++ de->namelen, de->name); ++ return 0; ++ } + return de; ++ } + } + return NULL; + } +@@ -241,6 +250,8 @@ struct dentry *proc_lookup_de(struct pro + return ERR_PTR(-ENOMEM); + d_set_d_op(dentry, &simple_dentry_operations); + d_add(dentry, inode); + /* generic proc entries belong to the host */ + i_tag_write(inode, 0); - goto out_unlock; - } + return NULL; } -@@ -506,6 +511,8 @@ int proc_readdir_de(struct proc_dir_entr - - /* filldir passes info to user space */ - pde_get(de); -+ if (!vx_hide_check(0, de->vx_flags)) -+ goto skip; - spin_unlock(&proc_subdir_lock); - if (filldir(dirent, de->name, de->namelen, filp->f_pos, - de->low_ino, de->mode >> 12) < 0) { -@@ -513,6 +520,7 @@ int proc_readdir_de(struct proc_dir_entr - goto out; - } - spin_lock(&proc_subdir_lock); -+ skip: - filp->f_pos++; - next = de->next; - pde_put(de); -@@ -625,6 +633,7 @@ static struct proc_dir_entry *__proc_cre - ent->namelen = len; + read_unlock(&proc_subdir_lock); +@@ -287,6 +298,12 @@ int proc_readdir_de(struct proc_dir_entr + do { + struct proc_dir_entry *next; + pde_get(de); ++ if (!vx_hide_check(0, de->vx_flags)) { ++ vxdprintk(VXD_CBIT(misc, 9), ++ VS_Q("%*s") " hidden in proc_readdir_de()", ++ de->namelen, de->name); ++ goto skip; ++ } + read_unlock(&proc_subdir_lock); + if (!dir_emit(ctx, de->name, de->namelen, + de->low_ino, de->mode >> 12)) { +@@ -294,6 +311,7 @@ int proc_readdir_de(struct proc_dir_entr + return 0; + } + read_lock(&proc_subdir_lock); ++ skip: + ctx->pos++; + next = pde_subdir_next(de); + pde_put(de); +@@ -387,6 +405,7 @@ static struct proc_dir_entry *__proc_cre ent->mode = mode; ent->nlink = nlink; + ent->subdir = RB_ROOT; + ent->vx_flags = IATTR_PROC_DEFAULT; atomic_set(&ent->count, 1); spin_lock_init(&ent->pde_unload_lock); INIT_LIST_HEAD(&ent->pde_openers); -@@ -648,7 +657,8 @@ struct proc_dir_entry *proc_symlink(cons +@@ -413,7 +432,8 @@ struct proc_dir_entry *proc_symlink(cons kfree(ent->data); kfree(ent); ent = NULL; @@ -6456,10 +5891,10 @@ diff -NurpP --minimal linux-3.7/fs/proc/generic.c linux-3.7-vs2.3.5.1/fs/proc/ge } else { kfree(ent); ent = NULL; -diff -NurpP --minimal linux-3.7/fs/proc/inode.c linux-3.7-vs2.3.5.1/fs/proc/inode.c ---- linux-3.7/fs/proc/inode.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/proc/inode.c 2012-12-11 15:56:32.000000000 +0000 -@@ -457,6 +457,8 @@ struct inode *proc_get_inode(struct supe +diff -urNp -x '*.orig' linux-4.9/fs/proc/inode.c linux-4.9/fs/proc/inode.c +--- linux-4.9/fs/proc/inode.c 2021-02-24 15:47:32.324010153 +0100 ++++ linux-4.9/fs/proc/inode.c 2021-02-24 15:47:45.081075908 +0100 +@@ -433,6 +433,8 @@ struct inode *proc_get_inode(struct supe inode->i_uid = de->uid; inode->i_gid = de->gid; } @@ -6468,29 +5903,49 @@ diff -NurpP --minimal linux-3.7/fs/proc/inode.c linux-3.7-vs2.3.5.1/fs/proc/inod if (de->size) inode->i_size = de->size; if (de->nlink) -diff -NurpP --minimal linux-3.7/fs/proc/internal.h linux-3.7-vs2.3.5.1/fs/proc/internal.h ---- linux-3.7/fs/proc/internal.h 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/proc/internal.h 2012-12-11 15:56:32.000000000 +0000 -@@ -11,6 +11,8 @@ - - #include - #include +diff -urNp -x '*.orig' linux-4.9/fs/proc/internal.h linux-4.9/fs/proc/internal.h +--- linux-4.9/fs/proc/internal.h 2021-02-24 15:47:32.324010153 +0100 ++++ linux-4.9/fs/proc/internal.h 2021-02-24 15:47:45.084409345 +0100 +@@ -14,6 +14,7 @@ + #include + #include + #include +#include -+ - struct ctl_table_header; - struct mempolicy; -@@ -54,6 +56,9 @@ extern int proc_pid_status(struct seq_fi - struct pid *pid, struct task_struct *task); - extern int proc_pid_statm(struct seq_file *m, struct pid_namespace *ns, - struct pid *pid, struct task_struct *task); -+extern int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns, -+ struct pid *pid, struct task_struct *task); + struct ctl_table_header; + struct mempolicy; +@@ -34,6 +35,7 @@ struct proc_dir_entry { + nlink_t nlink; + kuid_t uid; + kgid_t gid; ++ int vx_flags; + loff_t size; + const struct inode_operations *proc_iops; + const struct file_operations *proc_fops; +@@ -51,15 +53,22 @@ struct proc_dir_entry { + char name[]; + }; + ++struct vx_info; ++struct nx_info; + - extern loff_t mem_lseek(struct file *file, loff_t offset, int orig); + union proc_op { + int (*proc_get_link)(struct dentry *, struct path *); + int (*proc_show)(struct seq_file *m, + struct pid_namespace *ns, struct pid *pid, + struct task_struct *task); ++ int (*proc_vs_read)(char *page); ++ int (*proc_vxi_read)(struct vx_info *vxi, char *page); ++ int (*proc_nxi_read)(struct nx_info *nxi, char *page); + }; - extern const struct file_operations proc_tid_children_operations; -@@ -87,11 +92,16 @@ static inline struct pid *proc_pid(struc + struct proc_inode { + struct pid *pid; ++ int vx_flags; + unsigned int fd; + union proc_op op; + struct proc_dir_entry *pde; +@@ -93,11 +102,16 @@ static inline struct pid *proc_pid(struc return PROC_I(inode)->pid; } @@ -6505,12 +5960,21 @@ diff -NurpP --minimal linux-3.7/fs/proc/internal.h linux-3.7-vs2.3.5.1/fs/proc/i + return vx_get_proc_task(inode, proc_pid(inode)); +} + - static inline int proc_fd(struct inode *inode) + static inline int task_dumpable(struct task_struct *task) { - return PROC_I(inode)->fd; -diff -NurpP --minimal linux-3.7/fs/proc/loadavg.c linux-3.7-vs2.3.5.1/fs/proc/loadavg.c ---- linux-3.7/fs/proc/loadavg.c 2009-09-10 13:26:23.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/proc/loadavg.c 2012-12-11 15:56:32.000000000 +0000 + int dumpable = 0; +@@ -156,6 +170,8 @@ extern int proc_pid_status(struct seq_fi + struct pid *, struct task_struct *); + extern int proc_pid_statm(struct seq_file *, struct pid_namespace *, + struct pid *, struct task_struct *); ++extern int proc_pid_nsproxy(struct seq_file *m, struct pid_namespace *ns, ++ struct pid *pid, struct task_struct *task); + + /* + * base.c +diff -urNp -x '*.orig' linux-4.9/fs/proc/loadavg.c linux-4.9/fs/proc/loadavg.c +--- linux-4.9/fs/proc/loadavg.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/proc/loadavg.c 2021-02-24 15:47:45.084409345 +0100 @@ -12,15 +12,27 @@ static int loadavg_proc_show(struct seq_file *m, void *v) @@ -6540,23 +6004,23 @@ diff -NurpP --minimal linux-3.7/fs/proc/loadavg.c linux-3.7-vs2.3.5.1/fs/proc/lo task_active_pid_ns(current)->last_pid); return 0; } -diff -NurpP --minimal linux-3.7/fs/proc/meminfo.c linux-3.7-vs2.3.5.1/fs/proc/meminfo.c ---- linux-3.7/fs/proc/meminfo.c 2012-01-09 15:14:55.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/proc/meminfo.c 2012-12-11 15:56:32.000000000 +0000 -@@ -39,7 +39,8 @@ static int meminfo_proc_show(struct seq_ - allowed = ((totalram_pages - hugetlb_total_pages()) - * sysctl_overcommit_ratio / 100) + total_swap_pages; - -- cached = global_page_state(NR_FILE_PAGES) - +diff -urNp -x '*.orig' linux-4.9/fs/proc/meminfo.c linux-4.9/fs/proc/meminfo.c +--- linux-4.9/fs/proc/meminfo.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/proc/meminfo.c 2021-02-24 15:47:45.084409345 +0100 +@@ -55,7 +55,8 @@ static int meminfo_proc_show(struct seq_ + si_swapinfo(&i); + committed = percpu_counter_read_positive(&vm_committed_as); + +- cached = global_node_page_state(NR_FILE_PAGES) - + cached = vx_flags(VXF_VIRT_MEM, 0) ? -+ vx_vsi_cached(&i) : global_page_state(NR_FILE_PAGES) - - total_swapcache_pages - i.bufferram; ++ vx_vsi_cached(&i) : global_node_page_state(NR_FILE_PAGES) - + total_swapcache_pages() - i.bufferram; if (cached < 0) cached = 0; -diff -NurpP --minimal linux-3.7/fs/proc/root.c linux-3.7-vs2.3.5.1/fs/proc/root.c ---- linux-3.7/fs/proc/root.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/proc/root.c 2012-12-11 15:56:32.000000000 +0000 -@@ -19,9 +19,14 @@ +diff -urNp -x '*.orig' linux-4.9/fs/proc/root.c linux-4.9/fs/proc/root.c +--- linux-4.9/fs/proc/root.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/proc/root.c 2021-02-24 15:47:45.084409345 +0100 +@@ -20,9 +20,14 @@ #include #include #include @@ -6568,59 +6032,74 @@ diff -NurpP --minimal linux-3.7/fs/proc/root.c linux-3.7-vs2.3.5.1/fs/proc/root. + +extern void proc_vx_init(void); + - static int proc_test_super(struct super_block *sb, void *data) - { - return sb->s_fs_info == data; -@@ -189,6 +194,7 @@ void __init proc_root_init(void) - #endif + enum { + Opt_gid, Opt_hidepid, Opt_err, + }; +@@ -145,6 +150,7 @@ void __init proc_root_init(void) + proc_tty_init(); proc_mkdir("bus", NULL); proc_sys_init(); + proc_vx_init(); } static int proc_root_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat -@@ -255,6 +261,7 @@ struct proc_dir_entry proc_root = { +@@ -206,6 +212,7 @@ struct proc_dir_entry proc_root = { .proc_iops = &proc_root_inode_operations, .proc_fops = &proc_root_operations, .parent = &proc_root, + .vx_flags = IATTR_ADMIN | IATTR_WATCH, + .subdir = RB_ROOT, .name = "/proc", }; +diff -urNp -x '*.orig' linux-4.9/fs/proc/self.c linux-4.9/fs/proc/self.c +--- linux-4.9/fs/proc/self.c 2021-02-24 15:47:32.324010153 +0100 ++++ linux-4.9/fs/proc/self.c 2021-02-24 15:47:45.084409345 +0100 +@@ -1,6 +1,7 @@ + #include + #include + #include ++#include + #include "internal.h" -diff -NurpP --minimal linux-3.7/fs/proc/stat.c linux-3.7-vs2.3.5.1/fs/proc/stat.c ---- linux-3.7/fs/proc/stat.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/proc/stat.c 2012-12-12 13:54:26.000000000 +0000 + /* +@@ -61,6 +62,8 @@ int proc_setup_self(struct super_block * + self = d_alloc_name(s->s_root, "self"); + if (self) { + struct inode *inode = new_inode(s); ++ ++ // self->vx_flags = IATTR_PROC_SYMLINK; + if (inode) { + inode->i_ino = self_inum; + inode->i_mtime = inode->i_atime = inode->i_ctime = current_time(inode); +diff -urNp -x '*.orig' linux-4.9/fs/proc/stat.c linux-4.9/fs/proc/stat.c +--- linux-4.9/fs/proc/stat.c 2021-02-24 15:47:32.324010153 +0100 ++++ linux-4.9/fs/proc/stat.c 2021-02-24 15:47:45.084409345 +0100 @@ -9,8 +9,10 @@ #include #include #include +#include - #include + #include #include +#include #ifndef arch_irq_stat_cpu #define arch_irq_stat_cpu(cpu) 0 -@@ -87,14 +89,26 @@ static int show_stat(struct seq_file *p, +@@ -86,13 +88,21 @@ static int show_stat(struct seq_file *p, u64 sum_softirq = 0; unsigned int per_softirq_sums[NR_SOFTIRQS] = {0}; - struct timespec boottime; + struct timespec64 boottime; + cpumask_var_t cpus_allowed; + bool virt_cpu = vx_flags(VXF_VIRT_CPU, 0); user = nice = system = idle = iowait = irq = softirq = steal = 0; guest = guest_nice = 0; - getboottime(&boottime); -+ -+ if (vx_flags(VXF_VIRT_UPTIME, 0)) -+ vx_vsi_boottime(&boottime); -+ + getboottime64(&boottime); + + if (virt_cpu) + cpuset_cpus_allowed(current, cpus_allowed); + - jif = boottime.tv_sec; - for_each_possible_cpu(i) { + if (virt_cpu && !cpumask_test_cpu(i, cpus_allowed)) + continue; @@ -6628,7 +6107,7 @@ diff -NurpP --minimal linux-3.7/fs/proc/stat.c linux-3.7-vs2.3.5.1/fs/proc/stat. user += kcpustat_cpu(i).cpustat[CPUTIME_USER]; nice += kcpustat_cpu(i).cpustat[CPUTIME_NICE]; system += kcpustat_cpu(i).cpustat[CPUTIME_SYSTEM]; -@@ -131,6 +145,9 @@ static int show_stat(struct seq_file *p, +@@ -128,6 +138,9 @@ static int show_stat(struct seq_file *p, seq_putc(p, '\n'); for_each_online_cpu(i) { @@ -6638,41 +6117,38 @@ diff -NurpP --minimal linux-3.7/fs/proc/stat.c linux-3.7-vs2.3.5.1/fs/proc/stat. /* Copy values here to work around gcc-2.95.3, gcc-2.96 */ user = kcpustat_cpu(i).cpustat[CPUTIME_USER]; nice = kcpustat_cpu(i).cpustat[CPUTIME_NICE]; -diff -NurpP --minimal linux-3.7/fs/proc/uptime.c linux-3.7-vs2.3.5.1/fs/proc/uptime.c ---- linux-3.7/fs/proc/uptime.c 2012-03-19 18:47:26.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/proc/uptime.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/proc/uptime.c linux-4.9/fs/proc/uptime.c +--- linux-4.9/fs/proc/uptime.c 2021-02-24 15:47:32.327343590 +0100 ++++ linux-4.9/fs/proc/uptime.c 2021-02-24 15:47:45.084409345 +0100 @@ -5,6 +5,7 @@ #include #include #include +#include - #include static int uptime_proc_show(struct seq_file *m, void *v) -@@ -25,6 +26,10 @@ static int uptime_proc_show(struct seq_f - nsec = cputime64_to_jiffies64(idletime) * TICK_NSEC; + { +@@ -21,6 +22,7 @@ static int uptime_proc_show(struct seq_f + get_monotonic_boottime(&uptime); idle.tv_sec = div_u64_rem(nsec, NSEC_PER_SEC, &rem); idle.tv_nsec = rem; -+ -+ if (vx_flags(VXF_VIRT_UPTIME, 0)) -+ vx_vsi_uptime(&uptime, &idle); + seq_printf(m, "%lu.%02lu %lu.%02lu\n", (unsigned long) uptime.tv_sec, (uptime.tv_nsec / (NSEC_PER_SEC / 100)), -diff -NurpP --minimal linux-3.7/fs/proc_namespace.c linux-3.7-vs2.3.5.1/fs/proc_namespace.c ---- linux-3.7/fs/proc_namespace.c 2012-10-04 13:27:41.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/proc_namespace.c 2012-12-11 15:56:32.000000000 +0000 -@@ -44,6 +44,8 @@ static int show_sb_opts(struct seq_file - { MS_SYNCHRONOUS, ",sync" }, +diff -urNp -x '*.orig' linux-4.9/fs/proc_namespace.c linux-4.9/fs/proc_namespace.c +--- linux-4.9/fs/proc_namespace.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/proc_namespace.c 2021-02-24 15:47:45.084409345 +0100 +@@ -46,6 +46,8 @@ static int show_sb_opts(struct seq_file { MS_DIRSYNC, ",dirsync" }, { MS_MANDLOCK, ",mand" }, + { MS_LAZYTIME, ",lazytime" }, + { MS_TAGGED, ",tag" }, + { MS_NOTAGCHECK, ",notagcheck" }, { 0, NULL } }; const struct proc_fs_info *fs_infop; -@@ -80,6 +82,40 @@ static inline void mangle(struct seq_fil +@@ -82,6 +84,38 @@ static inline void mangle(struct seq_fil seq_escape(m, s, " \t\n\\"); } @@ -6689,7 +6165,7 @@ diff -NurpP --minimal linux-3.7/fs/proc_namespace.c linux-3.7-vs2.3.5.1/fs/proc_ + if (mnt == mnt->mnt_ns->root) + return 1; + -+ br_read_lock(&vfsmount_lock); ++ rcu_read_lock(); + root = current->fs->root; + root_mnt = real_mount(root.mnt); + point = root.dentry; @@ -6698,11 +6174,9 @@ diff -NurpP --minimal linux-3.7/fs/proc_namespace.c linux-3.7-vs2.3.5.1/fs/proc_ + point = mnt->mnt_mountpoint; + mnt = mnt->mnt_parent; + } ++ rcu_read_unlock(); + + ret = (mnt == root_mnt) && is_subdir(point, root.dentry); -+ -+ br_read_unlock(&vfsmount_lock); -+ + return ret; +} + @@ -6713,9 +6187,9 @@ diff -NurpP --minimal linux-3.7/fs/proc_namespace.c linux-3.7-vs2.3.5.1/fs/proc_ static void show_type(struct seq_file *m, struct super_block *sb) { mangle(m, sb->s_type->name); -@@ -96,6 +132,17 @@ static int show_vfsmnt(struct seq_file * - struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt }; +@@ -99,6 +133,17 @@ static int show_vfsmnt(struct seq_file * struct super_block *sb = mnt_path.dentry->d_sb; + int err; + if (vx_flags(VXF_HIDE_MOUNT, 0)) + return SEQ_SKIP; @@ -6731,17 +6205,17 @@ diff -NurpP --minimal linux-3.7/fs/proc_namespace.c linux-3.7-vs2.3.5.1/fs/proc_ if (sb->s_op->show_devname) { err = sb->s_op->show_devname(m, mnt_path.dentry); if (err) -@@ -106,6 +153,7 @@ static int show_vfsmnt(struct seq_file * - seq_putc(m, ' '); - seq_path(m, &mnt_path, " \t\n\\"); +@@ -112,6 +157,7 @@ static int show_vfsmnt(struct seq_file * + if (err) + goto out; seq_putc(m, ' '); +type: show_type(m, sb); seq_puts(m, __mnt_is_readonly(mnt) ? " ro" : " rw"); err = show_sb_opts(m, sb); -@@ -128,6 +176,11 @@ static int show_mountinfo(struct seq_fil - struct path root = p->root; - int err = 0; +@@ -133,6 +179,11 @@ static int show_mountinfo(struct seq_fil + struct path mnt_path = { .dentry = mnt->mnt_root, .mnt = mnt }; + int err; + if (vx_flags(VXF_HIDE_MOUNT, 0)) + return SEQ_SKIP; @@ -6750,10 +6224,10 @@ diff -NurpP --minimal linux-3.7/fs/proc_namespace.c linux-3.7-vs2.3.5.1/fs/proc_ + seq_printf(m, "%i %i %u:%u ", r->mnt_id, r->mnt_parent->mnt_id, MAJOR(sb->s_dev), MINOR(sb->s_dev)); - if (sb->s_op->show_path) -@@ -187,6 +240,17 @@ static int show_vfsstat(struct seq_file + if (sb->s_op->show_path) { +@@ -195,6 +246,17 @@ static int show_vfsstat(struct seq_file struct super_block *sb = mnt_path.dentry->d_sb; - int err = 0; + int err; + if (vx_flags(VXF_HIDE_MOUNT, 0)) + return SEQ_SKIP; @@ -6769,59 +6243,59 @@ diff -NurpP --minimal linux-3.7/fs/proc_namespace.c linux-3.7-vs2.3.5.1/fs/proc_ /* device */ if (sb->s_op->show_devname) { seq_puts(m, "device "); -@@ -203,7 +267,7 @@ static int show_vfsstat(struct seq_file - seq_puts(m, " mounted on "); - seq_path(m, &mnt_path, " \t\n\\"); +@@ -216,7 +278,7 @@ static int show_vfsstat(struct seq_file + if (err) + goto out; seq_putc(m, ' '); - +type: /* file system type */ seq_puts(m, "with fstype "); show_type(m, sb); -diff -NurpP --minimal linux-3.7/fs/quota/dquot.c linux-3.7-vs2.3.5.1/fs/quota/dquot.c ---- linux-3.7/fs/quota/dquot.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/quota/dquot.c 2012-12-11 15:56:32.000000000 +0000 -@@ -1582,6 +1582,9 @@ int __dquot_alloc_space(struct inode *in - struct dquot **dquots = inode->i_dquot; +diff -urNp -x '*.orig' linux-4.9/fs/quota/dquot.c linux-4.9/fs/quota/dquot.c +--- linux-4.9/fs/quota/dquot.c 2021-02-24 15:47:32.327343590 +0100 ++++ linux-4.9/fs/quota/dquot.c 2021-02-24 15:47:45.084409345 +0100 +@@ -1659,6 +1659,9 @@ int __dquot_alloc_space(struct inode *in int reserve = flags & DQUOT_SPACE_RESERVE; + struct dquot **dquots; + if ((ret = dl_alloc_space(inode, number))) + return ret; + - /* - * First test before acquiring mutex - solves deadlocks when we - * re-enter the quota code and are already holding the mutex -@@ -1637,6 +1640,9 @@ int dquot_alloc_inode(const struct inode + if (!dquot_active(inode)) { + inode_incr_space(inode, number, reserve); + goto out; +@@ -1711,6 +1714,9 @@ int dquot_alloc_inode(struct inode *inod struct dquot_warn warn[MAXQUOTAS]; - struct dquot * const *dquots = inode->i_dquot; + struct dquot * const *dquots; + if ((ret = dl_alloc_inode(inode))) + return ret; + - /* First test before acquiring mutex - solves deadlocks when we - * re-enter the quota code and are already holding the mutex */ if (!dquot_active(inode)) -@@ -1708,6 +1714,8 @@ void __dquot_free_space(struct inode *in - struct dquot **dquots = inode->i_dquot; - int reserve = flags & DQUOT_SPACE_RESERVE; + return 0; + for (cnt = 0; cnt < MAXQUOTAS; cnt++) +@@ -1813,6 +1819,8 @@ void __dquot_free_space(struct inode *in + struct dquot **dquots; + int reserve = flags & DQUOT_SPACE_RESERVE, index; + dl_free_space(inode, number); + - /* First test before acquiring mutex - solves deadlocks when we - * re-enter the quota code and are already holding the mutex */ if (!dquot_active(inode)) { -@@ -1752,6 +1760,8 @@ void dquot_free_inode(const struct inode - struct dquot_warn warn[MAXQUOTAS]; - struct dquot * const *dquots = inode->i_dquot; + inode_decr_space(inode, number, reserve); + return; +@@ -1857,6 +1865,8 @@ void dquot_free_inode(struct inode *inod + struct dquot * const *dquots; + int index; + dl_free_inode(inode); + - /* First test before acquiring mutex - solves deadlocks when we - * re-enter the quota code and are already holding the mutex */ if (!dquot_active(inode)) -diff -NurpP --minimal linux-3.7/fs/quota/quota.c linux-3.7-vs2.3.5.1/fs/quota/quota.c ---- linux-3.7/fs/quota/quota.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/quota/quota.c 2012-12-11 22:07:44.000000000 +0000 + return; + +diff -urNp -x '*.orig' linux-4.9/fs/quota/quota.c linux-4.9/fs/quota/quota.c +--- linux-4.9/fs/quota/quota.c 2021-02-24 15:47:32.327343590 +0100 ++++ linux-4.9/fs/quota/quota.c 2021-02-24 15:47:45.084409345 +0100 @@ -8,6 +8,7 @@ #include #include @@ -6830,7 +6304,7 @@ diff -NurpP --minimal linux-3.7/fs/quota/quota.c linux-3.7-vs2.3.5.1/fs/quota/qu #include #include #include -@@ -37,7 +38,7 @@ static int check_quotactl_permission(str +@@ -39,7 +40,7 @@ static int check_quotactl_permission(str break; /*FALLTHROUGH*/ default: @@ -6839,9 +6313,9 @@ diff -NurpP --minimal linux-3.7/fs/quota/quota.c linux-3.7-vs2.3.5.1/fs/quota/qu return -EPERM; } -@@ -307,6 +308,46 @@ static int do_quotactl(struct super_bloc - } - } +@@ -770,6 +771,46 @@ static int do_quotactl(struct super_bloc + + #ifdef CONFIG_BLOCK +#if defined(CONFIG_BLK_DEV_VROOT) || defined(CONFIG_BLK_DEV_VROOT_MODULE) + @@ -6886,7 +6360,7 @@ diff -NurpP --minimal linux-3.7/fs/quota/quota.c linux-3.7-vs2.3.5.1/fs/quota/qu /* Return 1 if 'cmd' will block on frozen filesystem */ static int quotactl_cmd_write(int cmd) { -@@ -339,6 +380,22 @@ static struct super_block *quotactl_bloc +@@ -811,6 +852,22 @@ static struct super_block *quotactl_bloc putname(tmp); if (IS_ERR(bdev)) return ERR_CAST(bdev); @@ -6909,9 +6383,9 @@ diff -NurpP --minimal linux-3.7/fs/quota/quota.c linux-3.7-vs2.3.5.1/fs/quota/qu if (quotactl_cmd_write(cmd)) sb = get_super_thawed(bdev); else -diff -NurpP --minimal linux-3.7/fs/stat.c linux-3.7-vs2.3.5.1/fs/stat.c ---- linux-3.7/fs/stat.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/stat.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/stat.c linux-4.9/fs/stat.c +--- linux-4.9/fs/stat.c 2021-02-24 15:47:32.334010466 +0100 ++++ linux-4.9/fs/stat.c 2021-02-24 15:47:45.084409345 +0100 @@ -26,6 +26,7 @@ void generic_fillattr(struct inode *inod stat->nlink = inode->i_nlink; stat->uid = inode->i_uid; @@ -6920,9 +6394,9 @@ diff -NurpP --minimal linux-3.7/fs/stat.c linux-3.7-vs2.3.5.1/fs/stat.c stat->rdev = inode->i_rdev; stat->size = i_size_read(inode); stat->atime = inode->i_atime; -diff -NurpP --minimal linux-3.7/fs/statfs.c linux-3.7-vs2.3.5.1/fs/statfs.c ---- linux-3.7/fs/statfs.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/statfs.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/statfs.c linux-4.9/fs/statfs.c +--- linux-4.9/fs/statfs.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/statfs.c 2021-02-24 15:47:45.084409345 +0100 @@ -7,6 +7,8 @@ #include #include @@ -6941,20 +6415,49 @@ diff -NurpP --minimal linux-3.7/fs/statfs.c linux-3.7-vs2.3.5.1/fs/statfs.c return retval; } -diff -NurpP --minimal linux-3.7/fs/super.c linux-3.7-vs2.3.5.1/fs/super.c ---- linux-3.7/fs/super.c 2012-12-11 15:47:36.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/super.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/super.c linux-4.9/fs/super.c +--- linux-4.9/fs/super.c 2021-02-24 15:47:32.334010466 +0100 ++++ linux-4.9/fs/super.c 2021-02-24 15:47:45.084409345 +0100 @@ -34,6 +34,8 @@ - #include #include #include + #include +#include +#include #include "internal.h" -@@ -1119,6 +1121,13 @@ mount_fs(struct file_system_type *type, - WARN_ON(sb->s_bdi == &default_backing_dev_info); +@@ -482,7 +484,7 @@ struct super_block *sget_userns(struct f + + if (!(flags & (MS_KERNMOUNT|MS_SUBMOUNT)) && + !(type->fs_flags & FS_USERNS_MOUNT) && +- !capable(CAP_SYS_ADMIN)) ++ !vx_capable(CAP_SYS_ADMIN, VXC_SECURE_MOUNT)) + return ERR_PTR(-EPERM); + retry: + spin_lock(&sb_lock); +@@ -563,7 +565,8 @@ struct super_block *sget(struct file_sys + user_ns = &init_user_ns; + + /* Ensure the requestor has permissions over the target filesystem */ +- if (!(flags & (MS_KERNMOUNT|MS_SUBMOUNT)) && !ns_capable(user_ns, CAP_SYS_ADMIN)) ++ if (!(flags & (MS_KERNMOUNT|MS_SUBMOUNT)) && ++ !vx_ns_capable(user_ns, CAP_SYS_ADMIN, VXC_SECURE_MOUNT)) + return ERR_PTR(-EPERM); + + return sget_userns(type, test, set, flags, user_ns, data); +@@ -995,7 +998,8 @@ struct dentry *mount_ns(struct file_syst + /* Don't allow mounting unless the caller has CAP_SYS_ADMIN + * over the namespace. + */ +- if (!(flags & MS_KERNMOUNT) && !ns_capable(user_ns, CAP_SYS_ADMIN)) ++ if (!(flags & MS_KERNMOUNT) && ++ !vx_ns_capable(user_ns, CAP_SYS_ADMIN, VXC_SECURE_MOUNT)) + return ERR_PTR(-EPERM); + + sb = sget_userns(fs_type, ns_test_super, ns_set_super, flags, +@@ -1213,6 +1217,13 @@ mount_fs(struct file_system_type *type, + smp_wmb(); sb->s_flags |= MS_BORN; + error = -EPERM; @@ -6967,21 +6470,9 @@ diff -NurpP --minimal linux-3.7/fs/super.c linux-3.7-vs2.3.5.1/fs/super.c error = security_sb_kern_mount(sb, flags, secdata); if (error) goto out_sb; -diff -NurpP --minimal linux-3.7/fs/sysfs/mount.c linux-3.7-vs2.3.5.1/fs/sysfs/mount.c ---- linux-3.7/fs/sysfs/mount.c 2012-10-04 13:27:41.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/sysfs/mount.c 2012-12-11 15:56:32.000000000 +0000 -@@ -47,7 +47,7 @@ static int sysfs_fill_super(struct super - - sb->s_blocksize = PAGE_CACHE_SIZE; - sb->s_blocksize_bits = PAGE_CACHE_SHIFT; -- sb->s_magic = SYSFS_MAGIC; -+ sb->s_magic = SYSFS_SUPER_MAGIC; - sb->s_op = &sysfs_ops; - sb->s_time_gran = 1; - -diff -NurpP --minimal linux-3.7/fs/utimes.c linux-3.7-vs2.3.5.1/fs/utimes.c ---- linux-3.7/fs/utimes.c 2012-12-11 15:47:37.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/utimes.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/utimes.c linux-4.9/fs/utimes.c +--- linux-4.9/fs/utimes.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/fs/utimes.c 2021-02-24 15:47:45.084409345 +0100 @@ -8,6 +8,8 @@ #include #include @@ -6991,29 +6482,30 @@ diff -NurpP --minimal linux-3.7/fs/utimes.c linux-3.7-vs2.3.5.1/fs/utimes.c #include #include -@@ -52,12 +54,18 @@ static int utimes_common(struct path *pa +@@ -52,13 +54,19 @@ static int utimes_common(struct path *pa { int error; struct iattr newattrs; - struct inode *inode = path->dentry->d_inode; + struct inode *delegated_inode = NULL; + struct inode *inode; ++ ++ error = cow_check_and_break(path); ++ if (error) ++ goto out; error = mnt_want_write(path->mnt); if (error) goto out; -+ error = cow_check_and_break(path); -+ if (error) -+ goto mnt_drop_write_and_out; -+ + inode = path->dentry->d_inode; + if (times && times[0].tv_nsec == UTIME_NOW && times[1].tv_nsec == UTIME_NOW) times = NULL; -diff -NurpP --minimal linux-3.7/fs/xattr.c linux-3.7-vs2.3.5.1/fs/xattr.c ---- linux-3.7/fs/xattr.c 2012-12-11 15:47:37.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xattr.c 2012-12-11 17:16:31.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/fs/xattr.c linux-4.9/fs/xattr.c +--- linux-4.9/fs/xattr.c 2021-02-24 15:47:32.340677341 +0100 ++++ linux-4.9/fs/xattr.c 2021-02-24 15:47:45.084409345 +0100 @@ -21,6 +21,7 @@ #include #include @@ -7022,7 +6514,7 @@ diff -NurpP --minimal linux-3.7/fs/xattr.c linux-3.7-vs2.3.5.1/fs/xattr.c #include -@@ -52,7 +53,7 @@ xattr_permission(struct inode *inode, co +@@ -112,7 +113,7 @@ xattr_permission(struct inode *inode, co * The trusted.* namespace can only be accessed by privileged users. */ if (!strncmp(name, XATTR_TRUSTED_PREFIX, XATTR_TRUSTED_PREFIX_LEN)) { @@ -7031,726 +6523,98 @@ diff -NurpP --minimal linux-3.7/fs/xattr.c linux-3.7-vs2.3.5.1/fs/xattr.c return (mask & MAY_WRITE) ? -EPERM : -ENODATA; return 0; } -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_dinode.h linux-3.7-vs2.3.5.1/fs/xfs/xfs_dinode.h ---- linux-3.7/fs/xfs/xfs_dinode.h 2012-10-04 13:27:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_dinode.h 2012-12-11 15:56:32.000000000 +0000 -@@ -51,7 +51,9 @@ typedef struct xfs_dinode { - __be32 di_nlink; /* number of links to file */ - __be16 di_projid_lo; /* lower part of owner's project id */ - __be16 di_projid_hi; /* higher part owner's project id */ -- __u8 di_pad[6]; /* unused, zeroed space */ -+ __u8 di_pad[2]; /* unused, zeroed space */ -+ __be16 di_tag; /* context tagging */ -+ __be16 di_vflags; /* vserver specific flags */ - __be16 di_flushiter; /* incremented on flush */ - xfs_timestamp_t di_atime; /* time last accessed */ - xfs_timestamp_t di_mtime; /* time last modified */ -@@ -184,6 +186,8 @@ static inline void xfs_dinode_put_rdev(s - #define XFS_DIFLAG_EXTSZINHERIT_BIT 12 /* inherit inode extent size */ - #define XFS_DIFLAG_NODEFRAG_BIT 13 /* do not reorganize/defragment */ - #define XFS_DIFLAG_FILESTREAM_BIT 14 /* use filestream allocator */ -+#define XFS_DIFLAG_IXUNLINK_BIT 15 /* Immutable inver on unlink */ -+ - #define XFS_DIFLAG_REALTIME (1 << XFS_DIFLAG_REALTIME_BIT) - #define XFS_DIFLAG_PREALLOC (1 << XFS_DIFLAG_PREALLOC_BIT) - #define XFS_DIFLAG_NEWRTBM (1 << XFS_DIFLAG_NEWRTBM_BIT) -@@ -199,6 +203,7 @@ static inline void xfs_dinode_put_rdev(s - #define XFS_DIFLAG_EXTSZINHERIT (1 << XFS_DIFLAG_EXTSZINHERIT_BIT) - #define XFS_DIFLAG_NODEFRAG (1 << XFS_DIFLAG_NODEFRAG_BIT) - #define XFS_DIFLAG_FILESTREAM (1 << XFS_DIFLAG_FILESTREAM_BIT) -+#define XFS_DIFLAG_IXUNLINK (1 << XFS_DIFLAG_IXUNLINK_BIT) - - #ifdef CONFIG_XFS_RT - #define XFS_IS_REALTIME_INODE(ip) ((ip)->i_d.di_flags & XFS_DIFLAG_REALTIME) -@@ -211,6 +216,10 @@ static inline void xfs_dinode_put_rdev(s - XFS_DIFLAG_IMMUTABLE | XFS_DIFLAG_APPEND | XFS_DIFLAG_SYNC | \ - XFS_DIFLAG_NOATIME | XFS_DIFLAG_NODUMP | XFS_DIFLAG_RTINHERIT | \ - XFS_DIFLAG_PROJINHERIT | XFS_DIFLAG_NOSYMLINKS | XFS_DIFLAG_EXTSIZE | \ -- XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG | XFS_DIFLAG_FILESTREAM) -+ XFS_DIFLAG_EXTSZINHERIT | XFS_DIFLAG_NODEFRAG | XFS_DIFLAG_FILESTREAM | \ -+ XFS_DIFLAG_IXUNLINK) -+ -+#define XFS_DIVFLAG_BARRIER 0x01 -+#define XFS_DIVFLAG_COW 0x02 - - #endif /* __XFS_DINODE_H__ */ -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_fs.h linux-3.7-vs2.3.5.1/fs/xfs/xfs_fs.h ---- linux-3.7/fs/xfs/xfs_fs.h 2011-10-24 16:45:31.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_fs.h 2012-12-11 15:56:32.000000000 +0000 -@@ -67,6 +67,9 @@ struct fsxattr { - #define XFS_XFLAG_EXTSZINHERIT 0x00001000 /* inherit inode extent size */ - #define XFS_XFLAG_NODEFRAG 0x00002000 /* do not defragment */ - #define XFS_XFLAG_FILESTREAM 0x00004000 /* use filestream allocator */ -+#define XFS_XFLAG_IXUNLINK 0x00008000 /* immutable invert on unlink */ -+#define XFS_XFLAG_BARRIER 0x10000000 /* chroot() barrier */ -+#define XFS_XFLAG_COW 0x20000000 /* copy on write mark */ - #define XFS_XFLAG_HASATTR 0x80000000 /* no DIFLAG for this */ - - /* -@@ -302,7 +305,8 @@ typedef struct xfs_bstat { - #define bs_projid bs_projid_lo /* (previously just bs_projid) */ - __u16 bs_forkoff; /* inode fork offset in bytes */ - __u16 bs_projid_hi; /* higher part of project id */ -- unsigned char bs_pad[10]; /* pad space, unused */ -+ unsigned char bs_pad[8]; /* pad space, unused */ -+ __u16 bs_tag; /* context tagging */ - __u32 bs_dmevmask; /* DMIG event mask */ - __u16 bs_dmstate; /* DMIG state info */ - __u16 bs_aextents; /* attribute number of extents */ -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_ialloc.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_ialloc.c ---- linux-3.7/fs/xfs/xfs_ialloc.c 2012-12-11 15:47:37.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_ialloc.c 2012-12-11 15:56:32.000000000 +0000 -@@ -37,7 +37,6 @@ - #include "xfs_error.h" - #include "xfs_bmap.h" - -- - /* - * Allocation group level functions. - */ -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_inode.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_inode.c ---- linux-3.7/fs/xfs/xfs_inode.c 2012-12-11 15:47:37.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_inode.c 2012-12-11 22:20:23.000000000 +0000 -@@ -16,6 +16,7 @@ - * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - */ - #include -+#include - - #include "xfs.h" - #include "xfs_fs.h" -@@ -563,15 +564,25 @@ xfs_iformat_btree( - STATIC void - xfs_dinode_from_disk( - xfs_icdinode_t *to, -- xfs_dinode_t *from) -+ xfs_dinode_t *from, -+ int tagged) - { -+ uint32_t uid, gid, tag; -+ - to->di_magic = be16_to_cpu(from->di_magic); - to->di_mode = be16_to_cpu(from->di_mode); - to->di_version = from ->di_version; - to->di_format = from->di_format; - to->di_onlink = be16_to_cpu(from->di_onlink); -- to->di_uid = be32_to_cpu(from->di_uid); -- to->di_gid = be32_to_cpu(from->di_gid); -+ -+ uid = be32_to_cpu(from->di_uid); -+ gid = be32_to_cpu(from->di_gid); -+ tag = be16_to_cpu(from->di_tag); -+ -+ to->di_uid = INOTAG_UID(tagged, uid, gid); -+ to->di_gid = INOTAG_GID(tagged, uid, gid); -+ to->di_tag = INOTAG_TAG(tagged, uid, gid, tag); -+ - to->di_nlink = be32_to_cpu(from->di_nlink); - to->di_projid_lo = be16_to_cpu(from->di_projid_lo); - to->di_projid_hi = be16_to_cpu(from->di_projid_hi); -@@ -593,21 +604,26 @@ xfs_dinode_from_disk( - to->di_dmevmask = be32_to_cpu(from->di_dmevmask); - to->di_dmstate = be16_to_cpu(from->di_dmstate); - to->di_flags = be16_to_cpu(from->di_flags); -+ to->di_vflags = be16_to_cpu(from->di_vflags); - to->di_gen = be32_to_cpu(from->di_gen); - } - - void - xfs_dinode_to_disk( - xfs_dinode_t *to, -- xfs_icdinode_t *from) -+ xfs_icdinode_t *from, -+ int tagged) - { - to->di_magic = cpu_to_be16(from->di_magic); - to->di_mode = cpu_to_be16(from->di_mode); - to->di_version = from ->di_version; - to->di_format = from->di_format; - to->di_onlink = cpu_to_be16(from->di_onlink); -- to->di_uid = cpu_to_be32(from->di_uid); -- to->di_gid = cpu_to_be32(from->di_gid); -+ -+ to->di_uid = cpu_to_be32(TAGINO_UID(tagged, from->di_uid, from->di_tag)); -+ to->di_gid = cpu_to_be32(TAGINO_GID(tagged, from->di_gid, from->di_tag)); -+ to->di_tag = cpu_to_be16(TAGINO_TAG(tagged, from->di_tag)); -+ - to->di_nlink = cpu_to_be32(from->di_nlink); - to->di_projid_lo = cpu_to_be16(from->di_projid_lo); - to->di_projid_hi = cpu_to_be16(from->di_projid_hi); -@@ -629,12 +645,14 @@ xfs_dinode_to_disk( - to->di_dmevmask = cpu_to_be32(from->di_dmevmask); - to->di_dmstate = cpu_to_be16(from->di_dmstate); - to->di_flags = cpu_to_be16(from->di_flags); -+ to->di_vflags = cpu_to_be16(from->di_vflags); - to->di_gen = cpu_to_be32(from->di_gen); - } - - STATIC uint - _xfs_dic2xflags( -- __uint16_t di_flags) -+ __uint16_t di_flags, -+ __uint16_t di_vflags) - { - uint flags = 0; - -@@ -645,6 +663,8 @@ _xfs_dic2xflags( - flags |= XFS_XFLAG_PREALLOC; - if (di_flags & XFS_DIFLAG_IMMUTABLE) - flags |= XFS_XFLAG_IMMUTABLE; -+ if (di_flags & XFS_DIFLAG_IXUNLINK) -+ flags |= XFS_XFLAG_IXUNLINK; - if (di_flags & XFS_DIFLAG_APPEND) - flags |= XFS_XFLAG_APPEND; - if (di_flags & XFS_DIFLAG_SYNC) -@@ -669,6 +689,10 @@ _xfs_dic2xflags( - flags |= XFS_XFLAG_FILESTREAM; - } - -+ if (di_vflags & XFS_DIVFLAG_BARRIER) -+ flags |= FS_BARRIER_FL; -+ if (di_vflags & XFS_DIVFLAG_COW) -+ flags |= FS_COW_FL; - return flags; +diff -urNp -x '*.orig' linux-4.9/include/linux/capability.h linux-4.9/include/linux/capability.h +--- linux-4.9/include/linux/capability.h 2021-02-24 15:47:32.377345154 +0100 ++++ linux-4.9/include/linux/capability.h 2021-02-24 15:47:45.084409345 +0100 +@@ -78,7 +78,8 @@ extern const kernel_cap_t __cap_init_eff + #else /* HAND-CODED capability initializers */ + + #define CAP_LAST_U32 ((_KERNEL_CAPABILITY_U32S) - 1) +-#define CAP_LAST_U32_VALID_MASK (CAP_TO_MASK(CAP_LAST_CAP + 1) -1) ++#define CAP_LAST_U32_VALID_MASK ((CAP_TO_MASK(CAP_LAST_CAP + 1) -1) \ ++ | CAP_TO_MASK(CAP_CONTEXT)) + + # define CAP_EMPTY_SET ((kernel_cap_t){{ 0, 0 }}) + # define CAP_FULL_SET ((kernel_cap_t){{ ~0, CAP_LAST_U32_VALID_MASK }}) +diff -urNp -x '*.orig' linux-4.9/include/linux/cred.h linux-4.9/include/linux/cred.h +--- linux-4.9/include/linux/cred.h 2021-02-24 15:47:32.380678592 +0100 ++++ linux-4.9/include/linux/cred.h 2021-02-24 15:47:45.087742783 +0100 +@@ -156,6 +156,7 @@ extern void exit_creds(struct task_struc + extern int copy_creds(struct task_struct *, unsigned long); + extern const struct cred *get_task_cred(struct task_struct *); + extern struct cred *cred_alloc_blank(void); ++extern struct cred *__prepare_creds(const struct cred *); + extern struct cred *prepare_creds(void); + extern struct cred *prepare_exec_creds(void); + extern int commit_creds(struct cred *); +@@ -216,6 +217,31 @@ static inline bool cap_ambient_invariant + cred->cap_inheritable)); } -@@ -678,7 +702,7 @@ xfs_ip2xflags( ++static inline void set_cred_subscribers(struct cred *cred, int n) ++{ ++#ifdef CONFIG_DEBUG_CREDENTIALS ++ atomic_set(&cred->subscribers, n); ++#endif ++} ++ ++static inline int read_cred_subscribers(const struct cred *cred) ++{ ++#ifdef CONFIG_DEBUG_CREDENTIALS ++ return atomic_read(&cred->subscribers); ++#else ++ return 0; ++#endif ++} ++ ++static inline void alter_cred_subscribers(const struct cred *_cred, int n) ++{ ++#ifdef CONFIG_DEBUG_CREDENTIALS ++ struct cred *cred = (struct cred *) _cred; ++ ++ atomic_add(n, &cred->subscribers); ++#endif ++} ++ + /** + * get_new_cred - Get a reference on a new set of credentials + * @cred: The new credentials to reference +diff -urNp -x '*.orig' linux-4.9/include/linux/dcache.h linux-4.9/include/linux/dcache.h +--- linux-4.9/include/linux/dcache.h 2021-02-24 15:47:32.380678592 +0100 ++++ linux-4.9/include/linux/dcache.h 2021-02-24 15:47:45.087742783 +0100 +@@ -308,8 +308,10 @@ extern char *dentry_path(struct dentry * + */ + static inline struct dentry *dget_dlock(struct dentry *dentry) { - xfs_icdinode_t *dic = &ip->i_d; - -- return _xfs_dic2xflags(dic->di_flags) | -+ return _xfs_dic2xflags(dic->di_flags, dic->di_vflags) | - (XFS_IFORK_Q(ip) ? XFS_XFLAG_HASATTR : 0); +- if (dentry) ++ if (dentry) { + dentry->d_lockref.count++; ++ // vx_dentry_inc(dentry); ++ } + return dentry; } -@@ -686,7 +710,8 @@ uint - xfs_dic2xflags( - xfs_dinode_t *dip) - { -- return _xfs_dic2xflags(be16_to_cpu(dip->di_flags)) | -+ return _xfs_dic2xflags(be16_to_cpu(dip->di_flags), -+ be16_to_cpu(dip->di_vflags)) | - (XFS_DFORK_Q(dip) ? XFS_XFLAG_HASATTR : 0); - } +diff -urNp -x '*.orig' linux-4.9/include/linux/devpts_fs.h linux-4.9/include/linux/devpts_fs.h +--- linux-4.9/include/linux/devpts_fs.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/include/linux/devpts_fs.h 2021-02-24 15:47:45.087742783 +0100 +@@ -34,5 +34,4 @@ void devpts_pty_kill(struct dentry *); -@@ -740,7 +765,8 @@ xfs_iread( - * Otherwise, just get the truly permanent information. - */ - if (dip->di_mode) { -- xfs_dinode_from_disk(&ip->i_d, dip); -+ xfs_dinode_from_disk(&ip->i_d, dip, -+ mp->m_flags & XFS_MOUNT_TAGGED); - error = xfs_iformat(ip, dip); - if (error) { - #ifdef DEBUG -@@ -927,6 +953,7 @@ xfs_ialloc( - ASSERT(ip->i_d.di_nlink == nlink); - ip->i_d.di_uid = current_fsuid(); - ip->i_d.di_gid = current_fsgid(); -+ ip->i_d.di_tag = current_fstag(&ip->i_vnode); - xfs_set_projid(ip, prid); - memset(&(ip->i_d.di_pad[0]), 0, sizeof(ip->i_d.di_pad)); - -@@ -986,6 +1013,7 @@ xfs_ialloc( - ip->i_d.di_dmevmask = 0; - ip->i_d.di_dmstate = 0; - ip->i_d.di_flags = 0; -+ ip->i_d.di_vflags = 0; - flags = XFS_ILOG_CORE; - switch (mode & S_IFMT) { - case S_IFIFO: -@@ -1668,6 +1696,7 @@ xfs_ifree( - } - ip->i_d.di_mode = 0; /* mark incore inode as free */ - ip->i_d.di_flags = 0; -+ ip->i_d.di_vflags = 0; - ip->i_d.di_dmevmask = 0; - ip->i_d.di_forkoff = 0; /* mark the attr fork not in use */ - ip->i_d.di_format = XFS_DINODE_FMT_EXTENTS; -@@ -1834,7 +1863,6 @@ xfs_iroot_realloc( - return; - } + #endif - + #endif /* _LINUX_DEVPTS_FS_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/fs.h linux-4.9/include/linux/fs.h +--- linux-4.9/include/linux/fs.h 2021-02-24 15:47:32.384012030 +0100 ++++ linux-4.9/include/linux/fs.h 2021-02-24 15:47:45.087742783 +0100 +@@ -231,6 +231,7 @@ typedef int (dio_iodone_t)(struct kiocb + #define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */ + #define ATTR_TIMES_SET (1 << 16) + #define ATTR_TOUCH (1 << 17) ++#define ATTR_TAG (1 << 18) + /* - * This is called when the amount of space needed for if_data - * is increased or decreased. The change in size is indicated by -@@ -2522,7 +2550,8 @@ xfs_iflush_int( - * because if the inode is dirty at all the core must - * be. - */ -- xfs_dinode_to_disk(dip, &ip->i_d); -+ xfs_dinode_to_disk(dip, &ip->i_d, -+ mp->m_flags & XFS_MOUNT_TAGGED); - - /* Wrap, we never let the log put out DI_MAX_FLUSH */ - if (ip->i_d.di_flushiter == DI_MAX_FLUSH) -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_inode.h linux-3.7-vs2.3.5.1/fs/xfs/xfs_inode.h ---- linux-3.7/fs/xfs/xfs_inode.h 2012-10-04 13:27:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_inode.h 2012-12-11 15:56:32.000000000 +0000 -@@ -134,7 +134,9 @@ typedef struct xfs_icdinode { - __uint32_t di_nlink; /* number of links to file */ - __uint16_t di_projid_lo; /* lower part of owner's project id */ - __uint16_t di_projid_hi; /* higher part of owner's project id */ -- __uint8_t di_pad[6]; /* unused, zeroed space */ -+ __uint8_t di_pad[2]; /* unused, zeroed space */ -+ __uint16_t di_tag; /* context tagging */ -+ __uint16_t di_vflags; /* vserver specific flags */ - __uint16_t di_flushiter; /* incremented on flush */ - xfs_ictimestamp_t di_atime; /* time last accessed */ - xfs_ictimestamp_t di_mtime; /* time last modified */ -@@ -561,7 +563,7 @@ int xfs_imap_to_bp(struct xfs_mount *, - int xfs_iread(struct xfs_mount *, struct xfs_trans *, - struct xfs_inode *, uint); - void xfs_dinode_to_disk(struct xfs_dinode *, -- struct xfs_icdinode *); -+ struct xfs_icdinode *, int); - void xfs_idestroy_fork(struct xfs_inode *, int); - void xfs_idata_realloc(struct xfs_inode *, int, int); - void xfs_iroot_realloc(struct xfs_inode *, int, int); -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_ioctl.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_ioctl.c ---- linux-3.7/fs/xfs/xfs_ioctl.c 2012-12-11 15:47:37.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_ioctl.c 2012-12-11 15:56:32.000000000 +0000 -@@ -26,7 +26,7 @@ - #include "xfs_bmap_btree.h" - #include "xfs_dinode.h" - #include "xfs_inode.h" --#include "xfs_ioctl.h" -+// #include "xfs_ioctl.h" - #include "xfs_rtalloc.h" - #include "xfs_itable.h" - #include "xfs_error.h" -@@ -762,6 +762,10 @@ xfs_merge_ioc_xflags( - xflags |= XFS_XFLAG_IMMUTABLE; - else - xflags &= ~XFS_XFLAG_IMMUTABLE; -+ if (flags & FS_IXUNLINK_FL) -+ xflags |= XFS_XFLAG_IXUNLINK; -+ else -+ xflags &= ~XFS_XFLAG_IXUNLINK; - if (flags & FS_APPEND_FL) - xflags |= XFS_XFLAG_APPEND; - else -@@ -790,6 +794,8 @@ xfs_di2lxflags( - - if (di_flags & XFS_DIFLAG_IMMUTABLE) - flags |= FS_IMMUTABLE_FL; -+ if (di_flags & XFS_DIFLAG_IXUNLINK) -+ flags |= FS_IXUNLINK_FL; - if (di_flags & XFS_DIFLAG_APPEND) - flags |= FS_APPEND_FL; - if (di_flags & XFS_DIFLAG_SYNC) -@@ -850,6 +856,8 @@ xfs_set_diflags( - di_flags = (ip->i_d.di_flags & XFS_DIFLAG_PREALLOC); - if (xflags & XFS_XFLAG_IMMUTABLE) - di_flags |= XFS_DIFLAG_IMMUTABLE; -+ if (xflags & XFS_XFLAG_IXUNLINK) -+ di_flags |= XFS_DIFLAG_IXUNLINK; - if (xflags & XFS_XFLAG_APPEND) - di_flags |= XFS_DIFLAG_APPEND; - if (xflags & XFS_XFLAG_SYNC) -@@ -892,6 +900,10 @@ xfs_diflags_to_linux( - inode->i_flags |= S_IMMUTABLE; - else - inode->i_flags &= ~S_IMMUTABLE; -+ if (xflags & XFS_XFLAG_IXUNLINK) -+ inode->i_flags |= S_IXUNLINK; -+ else -+ inode->i_flags &= ~S_IXUNLINK; - if (xflags & XFS_XFLAG_APPEND) - inode->i_flags |= S_APPEND; - else -@@ -1396,10 +1408,18 @@ xfs_file_ioctl( - case XFS_IOC_FSGETXATTRA: - return xfs_ioc_fsgetxattr(ip, 1, arg); - case XFS_IOC_FSSETXATTR: -+ if (IS_BARRIER(inode)) { -+ vxwprintk_task(1, "messing with the barrier."); -+ return -XFS_ERROR(EACCES); -+ } - return xfs_ioc_fssetxattr(ip, filp, arg); - case XFS_IOC_GETXFLAGS: - return xfs_ioc_getxflags(ip, arg); - case XFS_IOC_SETXFLAGS: -+ if (IS_BARRIER(inode)) { -+ vxwprintk_task(1, "messing with the barrier."); -+ return -XFS_ERROR(EACCES); -+ } - return xfs_ioc_setxflags(ip, filp, arg); - - case XFS_IOC_FSSETDM: { -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_ioctl.h linux-3.7-vs2.3.5.1/fs/xfs/xfs_ioctl.h ---- linux-3.7/fs/xfs/xfs_ioctl.h 2011-10-24 16:45:31.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_ioctl.h 2012-12-11 15:56:32.000000000 +0000 -@@ -70,6 +70,12 @@ xfs_handle_to_dentry( - void __user *uhandle, - u32 hlen); - -+extern int -+xfs_sync_flags( -+ struct inode *inode, -+ int flags, -+ int vflags); -+ - extern long - xfs_file_ioctl( - struct file *filp, -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_iops.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_iops.c ---- linux-3.7/fs/xfs/xfs_iops.c 2012-10-04 13:27:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_iops.c 2012-12-11 15:56:32.000000000 +0000 -@@ -28,6 +28,7 @@ - #include "xfs_bmap_btree.h" - #include "xfs_dinode.h" - #include "xfs_inode.h" -+#include "xfs_ioctl.h" - #include "xfs_bmap.h" - #include "xfs_rtalloc.h" - #include "xfs_error.h" -@@ -46,6 +47,7 @@ - #include - #include - #include -+#include - - static int - xfs_initxattrs( -@@ -421,6 +423,7 @@ xfs_vn_getattr( - stat->nlink = ip->i_d.di_nlink; - stat->uid = ip->i_d.di_uid; - stat->gid = ip->i_d.di_gid; -+ stat->tag = ip->i_d.di_tag; - stat->ino = ip->i_ino; - stat->atime = inode->i_atime; - stat->mtime = inode->i_mtime; -@@ -1033,6 +1036,7 @@ static const struct inode_operations xfs - .listxattr = xfs_vn_listxattr, - .fiemap = xfs_vn_fiemap, - .update_time = xfs_vn_update_time, -+ .sync_flags = xfs_sync_flags, - }; - - static const struct inode_operations xfs_dir_inode_operations = { -@@ -1059,6 +1063,7 @@ static const struct inode_operations xfs - .removexattr = generic_removexattr, - .listxattr = xfs_vn_listxattr, - .update_time = xfs_vn_update_time, -+ .sync_flags = xfs_sync_flags, - }; - - static const struct inode_operations xfs_dir_ci_inode_operations = { -@@ -1110,6 +1115,10 @@ xfs_diflags_to_iflags( - inode->i_flags |= S_IMMUTABLE; - else - inode->i_flags &= ~S_IMMUTABLE; -+ if (ip->i_d.di_flags & XFS_DIFLAG_IXUNLINK) -+ inode->i_flags |= S_IXUNLINK; -+ else -+ inode->i_flags &= ~S_IXUNLINK; - if (ip->i_d.di_flags & XFS_DIFLAG_APPEND) - inode->i_flags |= S_APPEND; - else -@@ -1122,6 +1131,15 @@ xfs_diflags_to_iflags( - inode->i_flags |= S_NOATIME; - else - inode->i_flags &= ~S_NOATIME; -+ -+ if (ip->i_d.di_vflags & XFS_DIVFLAG_BARRIER) -+ inode->i_vflags |= V_BARRIER; -+ else -+ inode->i_vflags &= ~V_BARRIER; -+ if (ip->i_d.di_vflags & XFS_DIVFLAG_COW) -+ inode->i_vflags |= V_COW; -+ else -+ inode->i_vflags &= ~V_COW; - } - - /* -@@ -1153,6 +1171,7 @@ xfs_setup_inode( - set_nlink(inode, ip->i_d.di_nlink); - inode->i_uid = ip->i_d.di_uid; - inode->i_gid = ip->i_d.di_gid; -+ inode->i_tag = ip->i_d.di_tag; - - switch (inode->i_mode & S_IFMT) { - case S_IFBLK: -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_itable.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_itable.c ---- linux-3.7/fs/xfs/xfs_itable.c 2012-10-04 13:27:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_itable.c 2012-12-11 15:56:32.000000000 +0000 -@@ -96,6 +96,7 @@ xfs_bulkstat_one_int( - buf->bs_mode = dic->di_mode; - buf->bs_uid = dic->di_uid; - buf->bs_gid = dic->di_gid; -+ buf->bs_tag = dic->di_tag; - buf->bs_size = dic->di_size; - buf->bs_atime.tv_sec = dic->di_atime.t_sec; - buf->bs_atime.tv_nsec = dic->di_atime.t_nsec; -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_linux.h linux-3.7-vs2.3.5.1/fs/xfs/xfs_linux.h ---- linux-3.7/fs/xfs/xfs_linux.h 2011-10-24 16:45:31.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_linux.h 2012-12-11 15:56:32.000000000 +0000 -@@ -121,6 +121,7 @@ - - #define current_cpu() (raw_smp_processor_id()) - #define current_pid() (current->pid) -+#define current_fstag(vp) (dx_current_fstag((vp)->i_sb)) - #define current_test_flags(f) (current->flags & (f)) - #define current_set_flags_nested(sp, f) \ - (*(sp) = current->flags, current->flags |= (f)) -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_log_recover.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_log_recover.c ---- linux-3.7/fs/xfs/xfs_log_recover.c 2012-12-11 15:47:37.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_log_recover.c 2012-12-11 15:56:32.000000000 +0000 -@@ -2359,7 +2359,8 @@ xlog_recover_inode_pass2( - } - - /* The core is in in-core format */ -- xfs_dinode_to_disk(dip, item->ri_buf[1].i_addr); -+ xfs_dinode_to_disk(dip, item->ri_buf[1].i_addr, -+ mp->m_flags & XFS_MOUNT_TAGGED); - - /* the rest is in on-disk format */ - if (item->ri_buf[1].i_len > sizeof(struct xfs_icdinode)) { -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_mount.h linux-3.7-vs2.3.5.1/fs/xfs/xfs_mount.h ---- linux-3.7/fs/xfs/xfs_mount.h 2012-12-11 15:47:37.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_mount.h 2012-12-11 15:56:32.000000000 +0000 -@@ -246,6 +246,7 @@ typedef struct xfs_mount { - allocator */ - #define XFS_MOUNT_NOATTR2 (1ULL << 25) /* disable use of attr2 format */ - -+#define XFS_MOUNT_TAGGED (1ULL << 31) /* context tagging */ - - /* - * Default minimum read and write sizes. -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_super.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_super.c ---- linux-3.7/fs/xfs/xfs_super.c 2012-12-11 15:47:37.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_super.c 2012-12-11 17:36:47.000000000 +0000 -@@ -114,6 +114,9 @@ mempool_t *xfs_ioend_pool; - #define MNTOPT_NODELAYLOG "nodelaylog" /* Delayed logging disabled */ - #define MNTOPT_DISCARD "discard" /* Discard unused blocks */ - #define MNTOPT_NODISCARD "nodiscard" /* Do not discard unused blocks */ -+#define MNTOPT_TAGXID "tagxid" /* context tagging for inodes */ -+#define MNTOPT_TAGGED "tag" /* context tagging for inodes */ -+#define MNTOPT_NOTAGTAG "notag" /* do not use context tagging */ - - /* - * Table driven mount option parser. -@@ -126,6 +129,8 @@ enum { - Opt_nobarrier, - Opt_inode64, - Opt_inode32, -+ Opt_tag, -+ Opt_notag, - Opt_err - }; - -@@ -134,6 +139,9 @@ static const match_table_t tokens = { - {Opt_nobarrier, "nobarrier"}, - {Opt_inode64, "inode64"}, - {Opt_inode32, "inode32"}, -+ {Opt_tag, "tagxid"}, -+ {Opt_tag, "tag"}, -+ {Opt_notag, "notag"}, - {Opt_err, NULL} - }; - -@@ -383,6 +391,19 @@ xfs_parseargs( - } else if (!strcmp(this_char, "irixsgid")) { - xfs_warn(mp, - "irixsgid is now a sysctl(2) variable, option is deprecated."); -+#ifndef CONFIG_TAGGING_NONE -+ } else if (!strcmp(this_char, MNTOPT_TAGGED)) { -+ mp->m_flags |= XFS_MOUNT_TAGGED; -+ } else if (!strcmp(this_char, MNTOPT_NOTAGTAG)) { -+ mp->m_flags &= ~XFS_MOUNT_TAGGED; -+ } else if (!strcmp(this_char, MNTOPT_TAGXID)) { -+ mp->m_flags |= XFS_MOUNT_TAGGED; -+#endif -+#ifdef CONFIG_PROPAGATE -+ } else if (!strcmp(this_char, MNTOPT_TAGGED)) { -+ /* use value */ -+ mp->m_flags |= XFS_MOUNT_TAGGED; -+#endif - } else { - xfs_warn(mp, "unknown mount option [%s].", this_char); - return EINVAL; -@@ -1149,6 +1170,16 @@ xfs_fs_remount( - case Opt_inode32: - mp->m_maxagi = xfs_set_inode32(mp); - break; -+ case Opt_tag: -+ if (!(sb->s_flags & MS_TAGGED)) { -+ printk(KERN_INFO -+ "XFS: %s: tagging not permitted on remount.\n", -+ sb->s_id); -+ return -EINVAL; -+ } -+ break; -+ case Opt_notag: -+ break; - default: - /* - * Logically we would return an error here to prevent -@@ -1368,6 +1399,9 @@ xfs_fs_fill_super( - if (error) - goto out_free_sb; - -+ if (mp->m_flags & XFS_MOUNT_TAGGED) -+ sb->s_flags |= MS_TAGGED; -+ - /* - * we must configure the block size in the superblock before we run the - * full mount process as the mount process can lookup and cache inodes. -diff -NurpP --minimal linux-3.7/fs/xfs/xfs_vnodeops.c linux-3.7-vs2.3.5.1/fs/xfs/xfs_vnodeops.c ---- linux-3.7/fs/xfs/xfs_vnodeops.c 2012-10-04 13:27:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/fs/xfs/xfs_vnodeops.c 2012-12-11 15:56:32.000000000 +0000 -@@ -103,6 +103,77 @@ xfs_readlink_bmap( - return error; - } - -+ -+STATIC void -+xfs_get_inode_flags( -+ xfs_inode_t *ip) -+{ -+ struct inode *inode = VFS_I(ip); -+ unsigned int flags = inode->i_flags; -+ unsigned int vflags = inode->i_vflags; -+ -+ if (flags & S_IMMUTABLE) -+ ip->i_d.di_flags |= XFS_DIFLAG_IMMUTABLE; -+ else -+ ip->i_d.di_flags &= ~XFS_DIFLAG_IMMUTABLE; -+ if (flags & S_IXUNLINK) -+ ip->i_d.di_flags |= XFS_DIFLAG_IXUNLINK; -+ else -+ ip->i_d.di_flags &= ~XFS_DIFLAG_IXUNLINK; -+ -+ if (vflags & V_BARRIER) -+ ip->i_d.di_vflags |= XFS_DIVFLAG_BARRIER; -+ else -+ ip->i_d.di_vflags &= ~XFS_DIVFLAG_BARRIER; -+ if (vflags & V_COW) -+ ip->i_d.di_vflags |= XFS_DIVFLAG_COW; -+ else -+ ip->i_d.di_vflags &= ~XFS_DIVFLAG_COW; -+} -+ -+int -+xfs_sync_flags( -+ struct inode *inode, -+ int flags, -+ int vflags) -+{ -+ struct xfs_inode *ip = XFS_I(inode); -+ struct xfs_mount *mp = ip->i_mount; -+ struct xfs_trans *tp; -+ unsigned int lock_flags = 0; -+ int code; -+ -+ tp = xfs_trans_alloc(mp, XFS_TRANS_SETATTR_NOT_SIZE); -+ code = xfs_trans_reserve(tp, 0, XFS_ICHANGE_LOG_RES(mp), 0, 0, 0); -+ if (code) -+ goto error_out; -+ -+ xfs_ilock(ip, XFS_ILOCK_EXCL); -+ xfs_trans_ijoin(tp, ip, 0); -+ -+ inode->i_flags = flags; -+ inode->i_vflags = vflags; -+ xfs_get_inode_flags(ip); -+ -+ xfs_trans_log_inode(tp, ip, XFS_ILOG_CORE); -+ xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG); -+ -+ XFS_STATS_INC(xs_ig_attrchg); -+ -+ if (mp->m_flags & XFS_MOUNT_WSYNC) -+ xfs_trans_set_sync(tp); -+ code = xfs_trans_commit(tp, 0); -+ xfs_iunlock(ip, XFS_ILOCK_EXCL); -+ return code; -+ -+error_out: -+ xfs_trans_cancel(tp, 0); -+ if (lock_flags) -+ xfs_iunlock(ip, XFS_ILOCK_EXCL); -+ return code; -+} -+ -+ - int - xfs_readlink( - xfs_inode_t *ip, -diff -NurpP --minimal linux-3.7/include/linux/Kbuild linux-3.7-vs2.3.5.1/include/linux/Kbuild ---- linux-3.7/include/linux/Kbuild 2012-12-11 15:47:38.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/Kbuild 2012-12-11 16:09:38.000000000 +0000 -@@ -3,3 +3,4 @@ header-y += hdlc/ - header-y += hsi/ - header-y += raid/ - header-y += usb/ -+header-y += vserver/ -diff -NurpP --minimal linux-3.7/include/linux/cred.h linux-3.7-vs2.3.5.1/include/linux/cred.h ---- linux-3.7/include/linux/cred.h 2012-07-22 21:39:43.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/cred.h 2012-12-11 15:56:32.000000000 +0000 -@@ -157,6 +157,7 @@ extern void exit_creds(struct task_struc - extern int copy_creds(struct task_struct *, unsigned long); - extern const struct cred *get_task_cred(struct task_struct *); - extern struct cred *cred_alloc_blank(void); -+extern struct cred *__prepare_creds(const struct cred *); - extern struct cred *prepare_creds(void); - extern struct cred *prepare_exec_creds(void); - extern int commit_creds(struct cred *); -@@ -210,6 +211,31 @@ static inline void validate_process_cred - } - #endif - -+static inline void set_cred_subscribers(struct cred *cred, int n) -+{ -+#ifdef CONFIG_DEBUG_CREDENTIALS -+ atomic_set(&cred->subscribers, n); -+#endif -+} -+ -+static inline int read_cred_subscribers(const struct cred *cred) -+{ -+#ifdef CONFIG_DEBUG_CREDENTIALS -+ return atomic_read(&cred->subscribers); -+#else -+ return 0; -+#endif -+} -+ -+static inline void alter_cred_subscribers(const struct cred *_cred, int n) -+{ -+#ifdef CONFIG_DEBUG_CREDENTIALS -+ struct cred *cred = (struct cred *) _cred; -+ -+ atomic_add(n, &cred->subscribers); -+#endif -+} -+ - /** - * get_new_cred - Get a reference on a new set of credentials - * @cred: The new credentials to reference -diff -NurpP --minimal linux-3.7/include/linux/devpts_fs.h linux-3.7-vs2.3.5.1/include/linux/devpts_fs.h ---- linux-3.7/include/linux/devpts_fs.h 2008-12-24 23:26:37.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/devpts_fs.h 2012-12-11 15:56:32.000000000 +0000 -@@ -45,5 +45,4 @@ static inline void devpts_pty_kill(struc - - #endif - -- - #endif /* _LINUX_DEVPTS_FS_H */ -diff -NurpP --minimal linux-3.7/include/linux/fs.h linux-3.7-vs2.3.5.1/include/linux/fs.h ---- linux-3.7/include/linux/fs.h 2012-12-11 15:47:41.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/fs.h 2012-12-11 21:23:03.000000000 +0000 -@@ -210,6 +210,7 @@ typedef void (dio_iodone_t)(struct kiocb - #define ATTR_KILL_PRIV (1 << 14) - #define ATTR_OPEN (1 << 15) /* Truncating from open(O_TRUNC) */ - #define ATTR_TIMES_SET (1 << 16) -+#define ATTR_TAG (1 << 17) - - /* - * This is the Inode Attributes structure, used for notify_change(). It -@@ -225,6 +226,7 @@ struct iattr { + * Whiteout is represented by a char device. The following constants define the +@@ -253,6 +254,7 @@ struct iattr { umode_t ia_mode; kuid_t ia_uid; kgid_t ia_gid; @@ -7758,7 +6622,7 @@ diff -NurpP --minimal linux-3.7/include/linux/fs.h linux-3.7-vs2.3.5.1/include/l loff_t ia_size; struct timespec ia_atime; struct timespec ia_mtime; -@@ -522,7 +524,9 @@ struct inode { +@@ -612,7 +614,9 @@ struct inode { unsigned short i_opflags; kuid_t i_uid; kgid_t i_gid; @@ -7769,7 +6633,7 @@ diff -NurpP --minimal linux-3.7/include/linux/fs.h linux-3.7-vs2.3.5.1/include/l #ifdef CONFIG_FS_POSIX_ACL struct posix_acl *i_acl; -@@ -551,6 +555,7 @@ struct inode { +@@ -641,6 +645,7 @@ struct inode { unsigned int __i_nlink; }; dev_t i_rdev; @@ -7777,23 +6641,11 @@ diff -NurpP --minimal linux-3.7/include/linux/fs.h linux-3.7-vs2.3.5.1/include/l loff_t i_size; struct timespec i_atime; struct timespec i_mtime; -@@ -701,6 +706,11 @@ static inline gid_t i_gid_read(const str - return from_kgid(&init_user_ns, inode->i_gid); - } - -+static inline tag_t i_tag_read(const struct inode *inode) -+{ -+ return from_ktag(&init_user_ns, inode->i_tag); -+} -+ - static inline void i_uid_write(struct inode *inode, uid_t uid) - { - inode->i_uid = make_kuid(&init_user_ns, uid); -@@ -711,14 +721,19 @@ static inline void i_gid_write(struct in - inode->i_gid = make_kgid(&init_user_ns, gid); +@@ -846,14 +851,19 @@ static inline void i_size_write(struct i + #endif } -+static inline void i_tag_write(struct inode *inode, tag_t tag) ++static inline void i_tag_write(struct inode *inode, vtag_t tag) +{ + inode->i_tag = make_ktag(&init_user_ns, tag); +} @@ -7811,43 +6663,55 @@ diff -NurpP --minimal linux-3.7/include/linux/fs.h linux-3.7-vs2.3.5.1/include/l } extern struct block_device *I_BDEV(struct inode *inode); -@@ -785,6 +800,7 @@ struct file { +@@ -910,6 +920,7 @@ struct file { loff_t f_pos; struct fown_struct f_owner; const struct cred *f_cred; -+ xid_t f_xid; ++ vxid_t f_xid; struct file_ra_state f_ra; u64 f_version; -@@ -936,6 +952,7 @@ struct file_lock { +@@ -1044,6 +1055,7 @@ struct file_lock { struct file *fl_file; loff_t fl_start; loff_t fl_end; -+ xid_t fl_xid; ++ vxid_t fl_xid; struct fasync_struct * fl_fasync; /* for lease break notifications */ /* for lease breaks: */ -@@ -1570,6 +1587,7 @@ struct inode_operations { - ssize_t (*getxattr) (struct dentry *, const char *, void *, size_t); +@@ -1477,6 +1489,11 @@ static inline gid_t i_gid_read(const str + return from_kgid(inode->i_sb->s_user_ns, inode->i_gid); + } + ++static inline vtag_t i_tag_read(const struct inode *inode) ++{ ++ return from_ktag(&init_user_ns, inode->i_tag); ++} ++ + static inline void i_uid_write(struct inode *inode, uid_t uid) + { + inode->i_uid = make_kuid(inode->i_sb->s_user_ns, uid); +@@ -1766,6 +1783,7 @@ struct inode_operations { + int (*setattr) (struct dentry *, struct iattr *); + int (*getattr) (struct vfsmount *mnt, struct dentry *, struct kstat *); ssize_t (*listxattr) (struct dentry *, char *, size_t); - int (*removexattr) (struct dentry *, const char *); + int (*sync_flags) (struct inode *, int, int); int (*fiemap)(struct inode *, struct fiemap_extent_info *, u64 start, u64 len); int (*update_time)(struct inode *, struct timespec *, int); -@@ -1584,6 +1602,7 @@ ssize_t rw_copy_check_uvector(int type, +@@ -1780,6 +1798,7 @@ ssize_t rw_copy_check_uvector(int type, unsigned long nr_segs, unsigned long fast_segs, struct iovec *fast_pointer, struct iovec **ret_pointer); +ssize_t vfs_sendfile(struct file *, struct file *, loff_t *, size_t, loff_t); - extern ssize_t vfs_read(struct file *, char __user *, size_t, loff_t *); - extern ssize_t vfs_write(struct file *, const char __user *, size_t, loff_t *); -@@ -1637,6 +1656,14 @@ struct super_operations { - #define S_IMA 1024 /* Inode has an associated IMA struct */ - #define S_AUTOMOUNT 2048 /* Automount/referral quasi-directory */ - #define S_NOSEC 4096 /* no suid or xattr security attributes */ -+#define S_IXUNLINK 8192 /* Immutable Invert on unlink */ + extern ssize_t __vfs_read(struct file *, char __user *, size_t, loff_t *); + extern ssize_t __vfs_write(struct file *, const char __user *, size_t, loff_t *); +@@ -1851,6 +1870,14 @@ struct super_operations { + #else + #define S_DAX 0 /* Make all the DAX code disappear */ + #endif ++#define S_IXUNLINK 16384 /* Immutable Invert on unlink */ + +/* Linux-VServer related Inode flags */ + @@ -7858,7 +6722,7 @@ diff -NurpP --minimal linux-3.7/include/linux/fs.h linux-3.7-vs2.3.5.1/include/l /* * Note that nosuid etc flags are inode-specific: setting some file-system -@@ -1661,10 +1688,13 @@ struct super_operations { +@@ -1875,10 +1902,13 @@ struct super_operations { #define IS_MANDLOCK(inode) __IS_FLG(inode, MS_MANDLOCK) #define IS_NOATIME(inode) __IS_FLG(inode, MS_RDONLY|MS_NOATIME) #define IS_I_VERSION(inode) __IS_FLG(inode, MS_I_VERSION) @@ -7872,9 +6736,9 @@ diff -NurpP --minimal linux-3.7/include/linux/fs.h linux-3.7-vs2.3.5.1/include/l #define IS_POSIXACL(inode) __IS_FLG(inode, MS_POSIXACL) #define IS_DEADDIR(inode) ((inode)->i_flags & S_DEAD) -@@ -1675,6 +1705,16 @@ struct super_operations { - #define IS_AUTOMOUNT(inode) ((inode)->i_flags & S_AUTOMOUNT) - #define IS_NOSEC(inode) ((inode)->i_flags & S_NOSEC) +@@ -1898,6 +1928,16 @@ static inline bool HAS_UNMAPPED_ID(struc + return !uid_valid(inode->i_uid) || !gid_valid(inode->i_gid); + } +#define IS_BARRIER(inode) (S_ISDIR((inode)->i_mode) && ((inode)->i_vflags & V_BARRIER)) + @@ -7889,9 +6753,9 @@ diff -NurpP --minimal linux-3.7/include/linux/fs.h linux-3.7-vs2.3.5.1/include/l /* * Inode state bits. Protected by inode->i_lock * -@@ -1900,6 +1940,9 @@ extern int rw_verify_area(int, struct fi - extern int locks_mandatory_locked(struct inode *); - extern int locks_mandatory_area(int, struct inode *, struct file *, loff_t, size_t); +@@ -2167,6 +2207,9 @@ extern struct kobject *fs_kobj; + extern int locks_mandatory_locked(struct file *); + extern int locks_mandatory_area(struct inode *, struct file *, loff_t, loff_t, unsigned char); +#define ATTR_FLAG_BARRIER 512 /* Barrier for chroot() */ +#define ATTR_FLAG_IXUNLINK 1024 /* Immutable invert on unlink */ @@ -7899,21 +6763,30 @@ diff -NurpP --minimal linux-3.7/include/linux/fs.h linux-3.7-vs2.3.5.1/include/l /* * Candidates for mandatory locking have the setgid bit set * but no group execute bit - an otherwise meaningless combination. -@@ -2504,6 +2547,7 @@ extern int dcache_dir_open(struct inode +@@ -2347,7 +2390,7 @@ struct filename { + const char iname[]; + }; + +-extern long vfs_truncate(const struct path *, loff_t); ++extern long vfs_truncate(struct path *, loff_t); + extern int do_truncate(struct dentry *, loff_t start, unsigned int time_attrs, + struct file *filp); + extern int vfs_fallocate(struct file *file, int mode, loff_t offset, +@@ -2978,6 +3021,7 @@ extern int dcache_dir_open(struct inode extern int dcache_dir_close(struct inode *, struct file *); extern loff_t dcache_dir_lseek(struct file *, loff_t, int); - extern int dcache_readdir(struct file *, void *, filldir_t); -+extern int dcache_readdir_filter(struct file *, void *, filldir_t, int (*)(struct dentry *)); + extern int dcache_readdir(struct file *, struct dir_context *); ++extern int dcache_readdir_filter(struct file *, struct dir_context *, int (*)(struct dentry *)); extern int simple_setattr(struct dentry *, struct iattr *); extern int simple_getattr(struct vfsmount *, struct dentry *, struct kstat *); extern int simple_statfs(struct dentry *, struct kstatfs *); -diff -NurpP --minimal linux-3.7/include/linux/init_task.h linux-3.7-vs2.3.5.1/include/linux/init_task.h ---- linux-3.7/include/linux/init_task.h 2012-12-11 15:47:42.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/init_task.h 2012-12-11 15:56:32.000000000 +0000 -@@ -210,6 +210,10 @@ extern struct task_group root_task_group - INIT_TRACE_RECURSION \ - INIT_TASK_RCU_PREEMPT(tsk) \ - INIT_CPUSET_SEQ \ +diff -urNp -x '*.orig' linux-4.9/include/linux/init_task.h linux-4.9/include/linux/init_task.h +--- linux-4.9/include/linux/init_task.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/include/linux/init_task.h 2021-02-24 15:47:45.087742783 +0100 +@@ -271,6 +271,10 @@ extern struct task_group root_task_group + INIT_VTIME(tsk) \ + INIT_NUMA_BALANCING(tsk) \ + INIT_KASAN(tsk) \ + .xid = 0, \ + .vx_info = NULL, \ + .nid = 0, \ @@ -7921,108 +6794,47 @@ diff -NurpP --minimal linux-3.7/include/linux/init_task.h linux-3.7-vs2.3.5.1/in } -diff -NurpP --minimal linux-3.7/include/linux/ipc.h linux-3.7-vs2.3.5.1/include/linux/ipc.h ---- linux-3.7/include/linux/ipc.h 2012-12-11 15:47:42.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/ipc.h 2012-12-11 22:24:37.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/include/linux/ipc.h linux-4.9/include/linux/ipc.h +--- linux-4.9/include/linux/ipc.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/include/linux/ipc.h 2021-02-24 15:47:45.087742783 +0100 @@ -16,6 +16,7 @@ struct kern_ipc_perm key_t key; kuid_t uid; kgid_t gid; -+ xid_t xid; ++ vxid_t xid; kuid_t cuid; kgid_t cgid; umode_t mode; -diff -NurpP --minimal linux-3.7/include/linux/ipc_namespace.h linux-3.7-vs2.3.5.1/include/linux/ipc_namespace.h ---- linux-3.7/include/linux/ipc_namespace.h 2012-07-22 21:39:43.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/ipc_namespace.h 2012-12-11 15:56:32.000000000 +0000 -@@ -133,7 +133,8 @@ static inline int mq_init_ns(struct ipc_ - - #if defined(CONFIG_IPC_NS) - extern struct ipc_namespace *copy_ipcs(unsigned long flags, -- struct task_struct *tsk); -+ struct ipc_namespace *old_ns, -+ struct user_namespace *user_ns); - static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) - { - if (ns) -@@ -144,12 +145,13 @@ static inline struct ipc_namespace *get_ - extern void put_ipc_ns(struct ipc_namespace *ns); - #else - static inline struct ipc_namespace *copy_ipcs(unsigned long flags, -- struct task_struct *tsk) -+ struct ipc_namespace *old_ns, -+ struct user_namespace *user_ns) - { - if (flags & CLONE_NEWIPC) - return ERR_PTR(-EINVAL); - -- return tsk->nsproxy->ipc_ns; -+ return old_ns; - } - - static inline struct ipc_namespace *get_ipc_ns(struct ipc_namespace *ns) -diff -NurpP --minimal linux-3.7/include/linux/loop.h linux-3.7-vs2.3.5.1/include/linux/loop.h ---- linux-3.7/include/linux/loop.h 2012-12-11 15:47:42.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/loop.h 2012-12-11 22:34:03.000000000 +0000 -@@ -41,6 +41,7 @@ struct loop_device { - struct loop_func_table *lo_encryption; - __u32 lo_init[2]; - kuid_t lo_key_owner; /* Who set the key */ -+ xid_t lo_xid; - int (*ioctl)(struct loop_device *, int cmd, - unsigned long arg); - -diff -NurpP --minimal linux-3.7/include/linux/memcontrol.h linux-3.7-vs2.3.5.1/include/linux/memcontrol.h ---- linux-3.7/include/linux/memcontrol.h 2012-12-11 15:47:42.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/memcontrol.h 2012-12-11 15:56:32.000000000 +0000 -@@ -83,6 +83,13 @@ extern struct mem_cgroup *try_get_mem_cg - extern struct mem_cgroup *parent_mem_cgroup(struct mem_cgroup *memcg); - extern struct mem_cgroup *mem_cgroup_from_cont(struct cgroup *cont); +diff -urNp -x '*.orig' linux-4.9/include/linux/memcontrol.h linux-4.9/include/linux/memcontrol.h +--- linux-4.9/include/linux/memcontrol.h 2021-02-24 15:47:32.397345780 +0100 ++++ linux-4.9/include/linux/memcontrol.h 2021-02-24 15:47:45.087742783 +0100 +@@ -92,6 +92,7 @@ enum mem_cgroup_events_target { + MEM_CGROUP_NTARGETS, + }; -+extern u64 mem_cgroup_res_read_u64(struct mem_cgroup *mem, int member); -+extern u64 mem_cgroup_memsw_read_u64(struct mem_cgroup *mem, int member); -+ -+extern s64 mem_cgroup_stat_read_cache(struct mem_cgroup *mem); -+extern s64 mem_cgroup_stat_read_anon(struct mem_cgroup *mem); -+extern s64 mem_cgroup_stat_read_mapped(struct mem_cgroup *mem); + - static inline - bool mm_match_cgroup(const struct mm_struct *mm, const struct mem_cgroup *memcg) - { -diff -NurpP --minimal linux-3.7/include/linux/mm_types.h linux-3.7-vs2.3.5.1/include/linux/mm_types.h ---- linux-3.7/include/linux/mm_types.h 2012-12-11 15:47:43.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/mm_types.h 2012-12-11 15:56:32.000000000 +0000 -@@ -365,6 +365,7 @@ struct mm_struct { - - /* Architecture-specific MM context */ - mm_context_t context; -+ struct vx_info *mm_vx_info; + #ifdef CONFIG_MEMCG - unsigned long flags; /* Must use atomic bitops to access the bits */ - -diff -NurpP --minimal linux-3.7/include/linux/mmzone.h linux-3.7-vs2.3.5.1/include/linux/mmzone.h ---- linux-3.7/include/linux/mmzone.h 2012-12-11 15:47:43.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/mmzone.h 2012-12-11 15:56:32.000000000 +0000 -@@ -735,6 +735,13 @@ typedef struct pglist_data { - __pgdat->node_start_pfn + __pgdat->node_spanned_pages;\ - }) + #define MEM_CGROUP_ID_SHIFT 16 +@@ -402,6 +403,12 @@ static inline bool mem_cgroup_is_descend + return cgroup_is_descendant(memcg->css.cgroup, root->css.cgroup); + } -+#define node_start_pfn(nid) (NODE_DATA(nid)->node_start_pfn) ++extern unsigned long mem_cgroup_mem_usage_pages(struct mem_cgroup *memcg); ++extern unsigned long mem_cgroup_mem_limit_pages(struct mem_cgroup *memcg); ++extern unsigned long mem_cgroup_memsw_usage_pages(struct mem_cgroup *memcg); ++extern unsigned long mem_cgroup_memsw_limit_pages(struct mem_cgroup *memcg); ++extern void dump_mem_cgroup(struct mem_cgroup *memcg); + -+#define node_end_pfn(nid) ({\ -+ pg_data_t *__pgdat = NODE_DATA(nid);\ -+ __pgdat->node_start_pfn + __pgdat->node_spanned_pages;\ -+}) -+ - #include - - extern struct mutex zonelists_mutex; -diff -NurpP --minimal linux-3.7/include/linux/mount.h linux-3.7-vs2.3.5.1/include/linux/mount.h ---- linux-3.7/include/linux/mount.h 2012-03-19 18:47:28.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/mount.h 2012-12-11 15:56:32.000000000 +0000 -@@ -47,6 +47,9 @@ struct mnt_namespace; - - #define MNT_INTERNAL 0x4000 + static inline bool mm_match_cgroup(struct mm_struct *mm, + struct mem_cgroup *memcg) + { +diff -urNp -x '*.orig' linux-4.9/include/linux/mount.h linux-4.9/include/linux/mount.h +--- linux-4.9/include/linux/mount.h 2021-02-24 15:47:32.400679218 +0100 ++++ linux-4.9/include/linux/mount.h 2021-02-24 15:47:45.087742783 +0100 +@@ -63,6 +63,9 @@ struct mnt_namespace; + #define MNT_MARKED 0x4000000 + #define MNT_UMOUNT 0x8000000 +#define MNT_TAGID 0x10000 +#define MNT_NOTAG 0x20000 @@ -8030,31 +6842,31 @@ diff -NurpP --minimal linux-3.7/include/linux/mount.h linux-3.7-vs2.3.5.1/includ struct vfsmount { struct dentry *mnt_root; /* root of the mounted tree */ struct super_block *mnt_sb; /* pointer to superblock */ -diff -NurpP --minimal linux-3.7/include/linux/net.h linux-3.7-vs2.3.5.1/include/linux/net.h ---- linux-3.7/include/linux/net.h 2012-12-11 15:47:43.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/net.h 2012-12-11 15:56:32.000000000 +0000 -@@ -38,6 +38,7 @@ struct net; +diff -urNp -x '*.orig' linux-4.9/include/linux/net.h linux-4.9/include/linux/net.h +--- linux-4.9/include/linux/net.h 2021-02-24 15:47:32.400679218 +0100 ++++ linux-4.9/include/linux/net.h 2021-02-24 15:47:45.091076220 +0100 +@@ -44,6 +44,7 @@ struct net; + #define SOCK_NOSPACE 2 #define SOCK_PASSCRED 3 #define SOCK_PASSSEC 4 - #define SOCK_EXTERNALLY_ALLOCATED 5 -+#define SOCK_USER_SOCKET 6 ++#define SOCK_USER_SOCKET 5 #ifndef ARCH_HAS_SOCKET_TYPES /** -diff -NurpP --minimal linux-3.7/include/linux/netdevice.h linux-3.7-vs2.3.5.1/include/linux/netdevice.h ---- linux-3.7/include/linux/netdevice.h 2012-12-11 15:47:43.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/netdevice.h 2012-12-11 15:56:32.000000000 +0000 -@@ -1637,6 +1637,7 @@ extern void netdev_resync_ops(struct ne - - extern struct net_device *dev_get_by_index(struct net *net, int ifindex); - extern struct net_device *__dev_get_by_index(struct net *net, int ifindex); -+extern struct net_device *dev_get_by_index_real_rcu(struct net *net, int ifindex); - extern struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex); - extern int dev_restart(struct net_device *dev); - #ifdef CONFIG_NETPOLL_TRAP -diff -NurpP --minimal linux-3.7/include/linux/nsproxy.h linux-3.7-vs2.3.5.1/include/linux/nsproxy.h ---- linux-3.7/include/linux/nsproxy.h 2011-10-24 16:45:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/nsproxy.h 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/include/linux/netdevice.h linux-4.9/include/linux/netdevice.h +--- linux-4.9/include/linux/netdevice.h 2021-02-24 15:47:33.074033615 +0100 ++++ linux-4.9/include/linux/netdevice.h 2021-02-24 15:47:45.087742783 +0100 +@@ -2489,6 +2489,7 @@ static inline int dev_recursion_level(vo + + struct net_device *dev_get_by_index(struct net *net, int ifindex); + struct net_device *__dev_get_by_index(struct net *net, int ifindex); ++struct net_device *dev_get_by_index_real_rcu(struct net *net, int ifindex); + struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex); + int netdev_get_name(struct net *net, char *name, int ifindex); + int dev_restart(struct net_device *dev); +diff -urNp -x '*.orig' linux-4.9/include/linux/nsproxy.h linux-4.9/include/linux/nsproxy.h +--- linux-4.9/include/linux/nsproxy.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/include/linux/nsproxy.h 2021-02-24 15:47:45.091076220 +0100 @@ -3,6 +3,7 @@ #include @@ -8063,16 +6875,16 @@ diff -NurpP --minimal linux-3.7/include/linux/nsproxy.h linux-3.7-vs2.3.5.1/incl struct mnt_namespace; struct uts_namespace; -@@ -63,6 +64,7 @@ static inline struct nsproxy *task_nspro - } +@@ -65,6 +66,7 @@ extern struct nsproxy init_nsproxy; + */ int copy_namespaces(unsigned long flags, struct task_struct *tsk); +struct nsproxy *copy_nsproxy(struct nsproxy *orig); void exit_task_namespaces(struct task_struct *tsk); void switch_task_namespaces(struct task_struct *tsk, struct nsproxy *new); void free_nsproxy(struct nsproxy *ns); -@@ -70,16 +72,26 @@ int unshare_nsproxy_namespaces(unsigned - struct fs_struct *); +@@ -72,16 +74,26 @@ int unshare_nsproxy_namespaces(unsigned + struct cred *, struct fs_struct *); int __init nsproxy_cache_init(void); -static inline void put_nsproxy(struct nsproxy *ns) @@ -8104,20 +6916,20 @@ diff -NurpP --minimal linux-3.7/include/linux/nsproxy.h linux-3.7-vs2.3.5.1/incl } #endif -diff -NurpP --minimal linux-3.7/include/linux/pid.h linux-3.7-vs2.3.5.1/include/linux/pid.h ---- linux-3.7/include/linux/pid.h 2011-07-22 09:18:11.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/pid.h 2012-12-11 15:56:32.000000000 +0000 -@@ -8,7 +8,8 @@ enum pid_type - PIDTYPE_PID, - PIDTYPE_PGID, +diff -urNp -x '*.orig' linux-4.9/include/linux/pid.h linux-4.9/include/linux/pid.h +--- linux-4.9/include/linux/pid.h 2021-02-24 15:47:32.407346093 +0100 ++++ linux-4.9/include/linux/pid.h 2021-02-24 15:47:45.091076220 +0100 +@@ -10,7 +10,8 @@ enum pid_type PIDTYPE_SID, -- PIDTYPE_MAX -+ PIDTYPE_MAX, -+ PIDTYPE_REALPID + PIDTYPE_MAX, + /* only valid to __task_pid_nr_ns() */ +- __PIDTYPE_TGID ++ __PIDTYPE_TGID, ++ __PIDTYPE_REALPID }; /* -@@ -171,6 +172,7 @@ static inline pid_t pid_nr(struct pid *p +@@ -172,6 +173,7 @@ static inline pid_t pid_nr(struct pid *p } pid_t pid_nr_ns(struct pid *pid, struct pid_namespace *ns); @@ -8125,47 +6937,9 @@ diff -NurpP --minimal linux-3.7/include/linux/pid.h linux-3.7-vs2.3.5.1/include/ pid_t pid_vnr(struct pid *pid); #define do_each_pid_task(pid, type, task) \ -diff -NurpP --minimal linux-3.7/include/linux/proc_fs.h linux-3.7-vs2.3.5.1/include/linux/proc_fs.h ---- linux-3.7/include/linux/proc_fs.h 2012-07-22 21:39:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/proc_fs.h 2012-12-11 15:56:32.000000000 +0000 -@@ -54,6 +54,7 @@ struct proc_dir_entry { - nlink_t nlink; - kuid_t uid; - kgid_t gid; -+ int vx_flags; - loff_t size; - const struct inode_operations *proc_iops; - /* -@@ -252,12 +253,18 @@ extern const struct proc_ns_operations n - extern const struct proc_ns_operations utsns_operations; - extern const struct proc_ns_operations ipcns_operations; - -+struct vx_info; -+struct nx_info; -+ - union proc_op { - int (*proc_get_link)(struct dentry *, struct path *); - int (*proc_read)(struct task_struct *task, char *page); - int (*proc_show)(struct seq_file *m, - struct pid_namespace *ns, struct pid *pid, - struct task_struct *task); -+ int (*proc_vs_read)(char *page); -+ int (*proc_vxi_read)(struct vx_info *vxi, char *page); -+ int (*proc_nxi_read)(struct nx_info *nxi, char *page); - }; - - struct ctl_table_header; -@@ -265,6 +272,7 @@ struct ctl_table; - - struct proc_inode { - struct pid *pid; -+ int vx_flags; - int fd; - union proc_op op; - struct proc_dir_entry *pde; -diff -NurpP --minimal linux-3.7/include/linux/quotaops.h linux-3.7-vs2.3.5.1/include/linux/quotaops.h ---- linux-3.7/include/linux/quotaops.h 2012-12-11 15:47:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/quotaops.h 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/include/linux/quotaops.h linux-4.9/include/linux/quotaops.h +--- linux-4.9/include/linux/quotaops.h 2021-02-24 15:47:32.410679531 +0100 ++++ linux-4.9/include/linux/quotaops.h 2021-02-24 15:47:45.091076220 +0100 @@ -8,6 +8,7 @@ #define _LINUX_QUOTAOPS_ @@ -8174,21 +6948,21 @@ diff -NurpP --minimal linux-3.7/include/linux/quotaops.h linux-3.7-vs2.3.5.1/inc #define DQUOT_SPACE_WARN 0x1 #define DQUOT_SPACE_RESERVE 0x2 -@@ -205,11 +206,12 @@ static inline void dquot_drop(struct ino +@@ -224,11 +225,12 @@ static inline void dquot_drop(struct ino - static inline int dquot_alloc_inode(const struct inode *inode) + static inline int dquot_alloc_inode(struct inode *inode) { - return 0; + return dl_alloc_inode(inode); } - static inline void dquot_free_inode(const struct inode *inode) + static inline void dquot_free_inode(struct inode *inode) { + dl_free_inode(inode); } static inline int dquot_transfer(struct inode *inode, struct iattr *iattr) -@@ -220,6 +222,10 @@ static inline int dquot_transfer(struct +@@ -239,6 +241,10 @@ static inline int dquot_transfer(struct static inline int __dquot_alloc_space(struct inode *inode, qsize_t number, int flags) { @@ -8199,7 +6973,7 @@ diff -NurpP --minimal linux-3.7/include/linux/quotaops.h linux-3.7-vs2.3.5.1/inc if (!(flags & DQUOT_SPACE_RESERVE)) inode_add_bytes(inode, number); return 0; -@@ -230,6 +236,7 @@ static inline void __dquot_free_space(st +@@ -249,6 +255,7 @@ static inline void __dquot_free_space(st { if (!(flags & DQUOT_SPACE_RESERVE)) inode_sub_bytes(inode, number); @@ -8207,10 +6981,10 @@ diff -NurpP --minimal linux-3.7/include/linux/quotaops.h linux-3.7-vs2.3.5.1/inc } static inline int dquot_claim_space_nodirty(struct inode *inode, qsize_t number) -diff -NurpP --minimal linux-3.7/include/linux/sched.h linux-3.7-vs2.3.5.1/include/linux/sched.h ---- linux-3.7/include/linux/sched.h 2012-12-11 15:47:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/sched.h 2012-12-11 15:56:32.000000000 +0000 -@@ -1378,6 +1378,14 @@ struct task_struct { +diff -urNp -x '*.orig' linux-4.9/include/linux/sched.h linux-4.9/include/linux/sched.h +--- linux-4.9/include/linux/sched.h 2021-02-24 15:47:32.414012968 +0100 ++++ linux-4.9/include/linux/sched.h 2021-02-24 15:47:45.091076220 +0100 +@@ -1719,6 +1719,14 @@ struct task_struct { #endif struct seccomp seccomp; @@ -8218,14 +6992,14 @@ diff -NurpP --minimal linux-3.7/include/linux/sched.h linux-3.7-vs2.3.5.1/includ + struct vx_info *vx_info; + struct nx_info *nx_info; + -+ xid_t xid; -+ nid_t nid; -+ tag_t tag; ++ vxid_t xid; ++ vnid_t nid; ++ vtag_t tag; + /* Thread group tracking */ - u32 parent_exec_id; - u32 self_exec_id; -@@ -1627,6 +1635,11 @@ struct pid_namespace; + u64 parent_exec_id; + u64 self_exec_id; +@@ -2114,6 +2122,11 @@ struct pid_namespace; pid_t __task_pid_nr_ns(struct task_struct *task, enum pid_type type, struct pid_namespace *ns); @@ -8237,7 +7011,7 @@ diff -NurpP --minimal linux-3.7/include/linux/sched.h linux-3.7-vs2.3.5.1/includ static inline pid_t task_pid_nr(struct task_struct *tsk) { return tsk->pid; -@@ -1640,7 +1653,8 @@ static inline pid_t task_pid_nr_ns(struc +@@ -2127,7 +2140,8 @@ static inline pid_t task_pid_nr_ns(struc static inline pid_t task_pid_vnr(struct task_struct *tsk) { @@ -8247,19 +7021,10 @@ diff -NurpP --minimal linux-3.7/include/linux/sched.h linux-3.7-vs2.3.5.1/includ } -@@ -1653,7 +1667,7 @@ pid_t task_tgid_nr_ns(struct task_struct - - static inline pid_t task_tgid_vnr(struct task_struct *tsk) - { -- return pid_vnr(task_tgid(tsk)); -+ return vx_map_tgid(pid_vnr(task_tgid(tsk))); - } - - -diff -NurpP --minimal linux-3.7/include/linux/shmem_fs.h linux-3.7-vs2.3.5.1/include/linux/shmem_fs.h ---- linux-3.7/include/linux/shmem_fs.h 2012-12-11 15:47:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/shmem_fs.h 2012-12-11 15:56:32.000000000 +0000 -@@ -9,6 +9,9 @@ +diff -urNp -x '*.orig' linux-4.9/include/linux/shmem_fs.h linux-4.9/include/linux/shmem_fs.h +--- linux-4.9/include/linux/shmem_fs.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/include/linux/shmem_fs.h 2021-02-24 15:47:45.091076220 +0100 +@@ -10,6 +10,9 @@ /* inode in-kernel data */ @@ -8268,35 +7033,35 @@ diff -NurpP --minimal linux-3.7/include/linux/shmem_fs.h linux-3.7-vs2.3.5.1/inc + struct shmem_inode_info { spinlock_t lock; - unsigned long flags; -diff -NurpP --minimal linux-3.7/include/linux/stat.h linux-3.7-vs2.3.5.1/include/linux/stat.h ---- linux-3.7/include/linux/stat.h 2012-12-11 15:47:45.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/stat.h 2012-12-11 15:56:32.000000000 +0000 + unsigned int seals; /* shmem seals */ +diff -urNp -x '*.orig' linux-4.9/include/linux/stat.h linux-4.9/include/linux/stat.h +--- linux-4.9/include/linux/stat.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/include/linux/stat.h 2021-02-24 15:47:45.091076220 +0100 @@ -25,6 +25,7 @@ struct kstat { unsigned int nlink; kuid_t uid; kgid_t gid; -+ tag_t tag; ++ ktag_t tag; dev_t rdev; loff_t size; struct timespec atime; -diff -NurpP --minimal linux-3.7/include/linux/sunrpc/auth.h linux-3.7-vs2.3.5.1/include/linux/sunrpc/auth.h ---- linux-3.7/include/linux/sunrpc/auth.h 2012-10-04 13:27:46.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/sunrpc/auth.h 2012-12-11 15:56:32.000000000 +0000 -@@ -25,6 +25,7 @@ +diff -urNp -x '*.orig' linux-4.9/include/linux/sunrpc/auth.h linux-4.9/include/linux/sunrpc/auth.h +--- linux-4.9/include/linux/sunrpc/auth.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/include/linux/sunrpc/auth.h 2021-02-24 15:47:45.091076220 +0100 +@@ -46,6 +46,7 @@ enum { struct auth_cred { - uid_t uid; - gid_t gid; -+ tag_t tag; + kuid_t uid; + kgid_t gid; ++ ktag_t tag; struct group_info *group_info; const char *principal; - unsigned char machine_cred : 1; -diff -NurpP --minimal linux-3.7/include/linux/sunrpc/clnt.h linux-3.7-vs2.3.5.1/include/linux/sunrpc/clnt.h ---- linux-3.7/include/linux/sunrpc/clnt.h 2012-12-11 15:47:45.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/sunrpc/clnt.h 2012-12-11 15:56:32.000000000 +0000 -@@ -49,7 +49,8 @@ struct rpc_clnt { - unsigned int cl_softrtry : 1,/* soft timeouts */ + unsigned long ac_flags; +diff -urNp -x '*.orig' linux-4.9/include/linux/sunrpc/clnt.h linux-4.9/include/linux/sunrpc/clnt.h +--- linux-4.9/include/linux/sunrpc/clnt.h 2021-02-24 15:47:32.417346405 +0100 ++++ linux-4.9/include/linux/sunrpc/clnt.h 2021-02-24 15:47:45.091076220 +0100 +@@ -52,7 +52,8 @@ struct rpc_clnt { cl_discrtry : 1,/* disconnect before retry */ + cl_noretranstimeo: 1,/* No retransmit timeouts */ cl_autobind : 1,/* use getport() */ - cl_chatty : 1;/* be verbose */ + cl_chatty : 1,/* be verbose */ @@ -8304,35 +7069,23 @@ diff -NurpP --minimal linux-3.7/include/linux/sunrpc/clnt.h linux-3.7-vs2.3.5.1/ struct rpc_rtt * cl_rtt; /* RTO estimator data */ const struct rpc_timeout *cl_timeout; /* Timeout strategy */ -diff -NurpP --minimal linux-3.7/include/linux/sysfs.h linux-3.7-vs2.3.5.1/include/linux/sysfs.h ---- linux-3.7/include/linux/sysfs.h 2012-07-22 21:39:44.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/sysfs.h 2012-12-11 15:56:32.000000000 +0000 -@@ -19,6 +19,8 @@ - #include - #include - -+#define SYSFS_SUPER_MAGIC 0x62656572 -+ - struct kobject; - struct module; - enum kobj_ns_type; -diff -NurpP --minimal linux-3.7/include/linux/types.h linux-3.7-vs2.3.5.1/include/linux/types.h ---- linux-3.7/include/linux/types.h 2012-12-11 15:47:45.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/types.h 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/include/linux/types.h linux-4.9/include/linux/types.h +--- linux-4.9/include/linux/types.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/include/linux/types.h 2021-02-24 15:47:45.091076220 +0100 @@ -32,6 +32,9 @@ typedef __kernel_uid32_t uid_t; typedef __kernel_gid32_t gid_t; typedef __kernel_uid16_t uid16_t; typedef __kernel_gid16_t gid16_t; -+typedef unsigned int xid_t; -+typedef unsigned int nid_t; -+typedef unsigned int tag_t; ++typedef unsigned int vxid_t; ++typedef unsigned int vnid_t; ++typedef unsigned int vtag_t; typedef unsigned long uintptr_t; -diff -NurpP --minimal linux-3.7/include/linux/uidgid.h linux-3.7-vs2.3.5.1/include/linux/uidgid.h ---- linux-3.7/include/linux/uidgid.h 2012-07-22 21:39:45.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/uidgid.h 2012-12-11 19:45:37.000000000 +0000 -@@ -23,13 +23,17 @@ typedef struct { +diff -urNp -x '*.orig' linux-4.9/include/linux/uidgid.h linux-4.9/include/linux/uidgid.h +--- linux-4.9/include/linux/uidgid.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/include/linux/uidgid.h 2021-02-24 15:47:45.091076220 +0100 +@@ -21,13 +21,17 @@ typedef struct { uid_t val; } kuid_t; @@ -8342,47 +7095,24 @@ diff -NurpP --minimal linux-3.7/include/linux/uidgid.h linux-3.7-vs2.3.5.1/inclu } kgid_t; +typedef struct { -+ tag_t val; ++ vtag_t val; +} ktag_t; + #define KUIDT_INIT(value) (kuid_t){ value } #define KGIDT_INIT(value) (kgid_t){ value } +#define KTAGT_INIT(value) (ktag_t){ value } + #ifdef CONFIG_MULTIUSER static inline uid_t __kuid_val(kuid_t uid) - { -@@ -41,10 +45,16 @@ static inline gid_t __kgid_val(kgid_t gi - return gid.val; +@@ -51,11 +55,18 @@ static inline gid_t __kgid_val(kgid_t gi } + #endif -+static inline tag_t __ktag_val(ktag_t tag) ++static inline vtag_t __ktag_val(ktag_t tag) +{ + return tag.val; +} + - #else - - typedef uid_t kuid_t; - typedef gid_t kgid_t; -+typedef tag_t ktag_t; - - static inline uid_t __kuid_val(kuid_t uid) - { -@@ -56,16 +66,24 @@ static inline gid_t __kgid_val(kgid_t gi - return gid; - } - -+static inline tag_t __ktag_val(ktag_t tag) -+{ -+ return tag; -+} -+ - #define KUIDT_INIT(value) ((kuid_t) value ) - #define KGIDT_INIT(value) ((kgid_t) value ) -+#define KTAGT_INIT(value) ((ktag_t) value ) - - #endif - #define GLOBAL_ROOT_UID KUIDT_INIT(0) #define GLOBAL_ROOT_GID KGIDT_INIT(0) +#define GLOBAL_ROOT_TAG KTAGT_INIT(0) @@ -8393,7 +7123,7 @@ diff -NurpP --minimal linux-3.7/include/linux/uidgid.h linux-3.7-vs2.3.5.1/inclu static inline bool uid_eq(kuid_t left, kuid_t right) { -@@ -77,6 +95,11 @@ static inline bool gid_eq(kgid_t left, k +@@ -67,6 +78,11 @@ static inline bool gid_eq(kgid_t left, k return __kgid_val(left) == __kgid_val(right); } @@ -8405,8 +7135,8 @@ diff -NurpP --minimal linux-3.7/include/linux/uidgid.h linux-3.7-vs2.3.5.1/inclu static inline bool uid_gt(kuid_t left, kuid_t right) { return __kuid_val(left) > __kuid_val(right); -@@ -127,13 +150,21 @@ static inline bool gid_valid(kgid_t gid) - return !gid_eq(gid, INVALID_GID); +@@ -117,13 +133,21 @@ static inline bool gid_valid(kgid_t gid) + return __kgid_val(gid) != (gid_t) -1; } +static inline bool tag_valid(ktag_t tag) @@ -8418,20 +7148,20 @@ diff -NurpP --minimal linux-3.7/include/linux/uidgid.h linux-3.7-vs2.3.5.1/inclu extern kuid_t make_kuid(struct user_namespace *from, uid_t uid); extern kgid_t make_kgid(struct user_namespace *from, gid_t gid); -+extern krag_t make_ktag(struct user_namespace *from, gid_t gid); ++extern ktag_t make_ktag(struct user_namespace *from, gid_t gid); extern uid_t from_kuid(struct user_namespace *to, kuid_t uid); extern gid_t from_kgid(struct user_namespace *to, kgid_t gid); -+extern tag_t from_ktag(struct user_namespace *to, ktag_t tag); ++extern vtag_t from_ktag(struct user_namespace *to, ktag_t tag); + extern uid_t from_kuid_munged(struct user_namespace *to, kuid_t uid); extern gid_t from_kgid_munged(struct user_namespace *to, kgid_t gid); -@@ -159,6 +190,11 @@ static inline kgid_t make_kgid(struct us +@@ -149,6 +173,11 @@ static inline kgid_t make_kgid(struct us return KGIDT_INIT(gid); } -+static inline ktag_t make_ktag(struct user_namespace *from, tag_t tag) ++static inline ktag_t make_ktag(struct user_namespace *from, vtag_t tag) +{ + return KTAGT_INIT(tag); +} @@ -8439,11 +7169,11 @@ diff -NurpP --minimal linux-3.7/include/linux/uidgid.h linux-3.7-vs2.3.5.1/inclu static inline uid_t from_kuid(struct user_namespace *to, kuid_t kuid) { return __kuid_val(kuid); -@@ -169,6 +205,11 @@ static inline gid_t from_kgid(struct use +@@ -159,6 +188,11 @@ static inline gid_t from_kgid(struct use return __kgid_val(kgid); } -+static inline tag_t from_ktag(struct user_namespace *to, ktag_t ktag) ++static inline vtag_t from_ktag(struct user_namespace *to, ktag_t ktag) +{ + return __ktag_val(ktag); +} @@ -8451,47 +7181,18 @@ diff -NurpP --minimal linux-3.7/include/linux/uidgid.h linux-3.7-vs2.3.5.1/inclu static inline uid_t from_kuid_munged(struct user_namespace *to, kuid_t kuid) { uid_t uid = from_kuid(to, kuid); -diff -NurpP --minimal linux-3.7/include/linux/utsname.h linux-3.7-vs2.3.5.1/include/linux/utsname.h ---- linux-3.7/include/linux/utsname.h 2012-12-11 15:47:45.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/utsname.h 2012-12-11 15:56:32.000000000 +0000 -@@ -33,7 +33,8 @@ static inline void get_uts_ns(struct uts - } - - extern struct uts_namespace *copy_utsname(unsigned long flags, -- struct task_struct *tsk); -+ struct uts_namespace *old_ns, -+ struct user_namespace *user_ns); - extern void free_uts_ns(struct kref *kref); - - static inline void put_uts_ns(struct uts_namespace *ns) -@@ -50,12 +51,13 @@ static inline void put_uts_ns(struct uts - } - - static inline struct uts_namespace *copy_utsname(unsigned long flags, -- struct task_struct *tsk) -+ struct uts_namespace *old_ns, -+ struct user_namespace *user_ns) - { - if (flags & CLONE_NEWUTS) - return ERR_PTR(-EINVAL); - -- return tsk->nsproxy->uts_ns; -+ return old_ns; - } - #endif - -diff -NurpP --minimal linux-3.7/include/linux/vroot.h linux-3.7-vs2.3.5.1/include/linux/vroot.h ---- linux-3.7/include/linux/vroot.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vroot.h 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/include/linux/vroot.h linux-4.9/include/linux/vroot.h +--- linux-4.9/include/linux/vroot.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vroot.h 2021-02-24 15:47:45.091076220 +0100 @@ -0,0 +1,51 @@ + +/* + * include/linux/vroot.h + * -+ * written by Herbert Pötzl, 9/11/2002 -+ * ported to 2.6 by Herbert Pötzl, 30/12/2004 ++ * written by Herbert P?tzl, 9/11/2002 ++ * ported to 2.6 by Herbert P?tzl, 30/12/2004 + * -+ * Copyright (C) 2002-2007 by Herbert Pötzl. ++ * Copyright (C) 2002-2007 by Herbert P?tzl. + * Redistribution of this file is permitted under the + * GNU General Public License. + */ @@ -8535,9 +7236,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vroot.h linux-3.7-vs2.3.5.1/includ +#define VROOT_CLR_DEV 0x5601 + +#endif /* _LINUX_VROOT_H */ -diff -NurpP --minimal linux-3.7/include/linux/vs_base.h linux-3.7-vs2.3.5.1/include/linux/vs_base.h ---- linux-3.7/include/linux/vs_base.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_base.h 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/include/linux/vs_base.h linux-4.9/include/linux/vs_base.h +--- linux-4.9/include/linux/vs_base.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vs_base.h 2021-02-24 15:47:45.091076220 +0100 @@ -0,0 +1,10 @@ +#ifndef _VS_BASE_H +#define _VS_BASE_H @@ -8549,9 +7250,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_base.h linux-3.7-vs2.3.5.1/incl +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_context.h linux-3.7-vs2.3.5.1/include/linux/vs_context.h ---- linux-3.7/include/linux/vs_context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_context.h 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/include/linux/vs_context.h linux-4.9/include/linux/vs_context.h +--- linux-4.9/include/linux/vs_context.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vs_context.h 2021-02-24 15:47:45.091076220 +0100 @@ -0,0 +1,242 @@ +#ifndef _VS_CONTEXT_H +#define _VS_CONTEXT_H @@ -8764,7 +7465,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_context.h linux-3.7-vs2.3.5.1/i +static inline void __enter_vx_admin(struct vx_info_save *vxis) +{ + vxis->vxi = xchg(¤t->vx_info, NULL); -+ vxis->xid = xchg(¤t->xid, (xid_t)0); ++ vxis->xid = xchg(¤t->xid, (vxid_t)0); +} + +static inline void __leave_vx_admin(struct vx_info_save *vxis) @@ -8795,9 +7496,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_context.h linux-3.7-vs2.3.5.1/i +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_cowbl.h linux-3.7-vs2.3.5.1/include/linux/vs_cowbl.h ---- linux-3.7/include/linux/vs_cowbl.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_cowbl.h 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/include/linux/vs_cowbl.h linux-4.9/include/linux/vs_cowbl.h +--- linux-4.9/include/linux/vs_cowbl.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vs_cowbl.h 2021-02-24 15:47:45.094409658 +0100 @@ -0,0 +1,48 @@ +#ifndef _VS_COWBL_H +#define _VS_COWBL_H @@ -8847,9 +7548,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_cowbl.h linux-3.7-vs2.3.5.1/inc +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_cvirt.h linux-3.7-vs2.3.5.1/include/linux/vs_cvirt.h ---- linux-3.7/include/linux/vs_cvirt.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_cvirt.h 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/include/linux/vs_cvirt.h linux-4.9/include/linux/vs_cvirt.h +--- linux-4.9/include/linux/vs_cvirt.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vs_cvirt.h 2021-02-24 15:47:45.094409658 +0100 @@ -0,0 +1,50 @@ +#ifndef _VS_CVIRT_H +#define _VS_CVIRT_H @@ -8901,9 +7602,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_cvirt.h linux-3.7-vs2.3.5.1/inc +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_device.h linux-3.7-vs2.3.5.1/include/linux/vs_device.h ---- linux-3.7/include/linux/vs_device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_device.h 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/include/linux/vs_device.h linux-4.9/include/linux/vs_device.h +--- linux-4.9/include/linux/vs_device.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vs_device.h 2021-02-24 15:47:45.094409658 +0100 @@ -0,0 +1,45 @@ +#ifndef _VS_DEVICE_H +#define _VS_DEVICE_H @@ -8950,9 +7651,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_device.h linux-3.7-vs2.3.5.1/in +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_dlimit.h linux-3.7-vs2.3.5.1/include/linux/vs_dlimit.h ---- linux-3.7/include/linux/vs_dlimit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_dlimit.h 2012-12-11 19:37:05.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/include/linux/vs_dlimit.h linux-4.9/include/linux/vs_dlimit.h +--- linux-4.9/include/linux/vs_dlimit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vs_dlimit.h 2021-02-24 15:47:45.094409658 +0100 @@ -0,0 +1,215 @@ +#ifndef _VS_DLIMIT_H +#define _VS_DLIMIT_H @@ -9002,7 +7703,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_dlimit.h linux-3.7-vs2.3.5.1/in +#define __dlimit_char(d) ((d) ? '*' : ' ') + +static inline int __dl_alloc_space(struct super_block *sb, -+ tag_t tag, dlsize_t nr, const char *file, int line) ++ vtag_t tag, dlsize_t nr, const char *file, int line) +{ + struct dl_info *dli = NULL; + int ret = 0; @@ -9028,7 +7729,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_dlimit.h linux-3.7-vs2.3.5.1/in +} + +static inline void __dl_free_space(struct super_block *sb, -+ tag_t tag, dlsize_t nr, const char *_file, int _line) ++ vtag_t tag, dlsize_t nr, const char *_file, int _line) +{ + struct dl_info *dli = NULL; + @@ -9053,7 +7754,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_dlimit.h linux-3.7-vs2.3.5.1/in +} + +static inline int __dl_alloc_inode(struct super_block *sb, -+ tag_t tag, const char *_file, int _line) ++ vtag_t tag, const char *_file, int _line) +{ + struct dl_info *dli; + int ret = 0; @@ -9075,7 +7776,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_dlimit.h linux-3.7-vs2.3.5.1/in +} + +static inline void __dl_free_inode(struct super_block *sb, -+ tag_t tag, const char *_file, int _line) ++ vtag_t tag, const char *_file, int _line) +{ + struct dl_info *dli; + @@ -9096,7 +7797,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_dlimit.h linux-3.7-vs2.3.5.1/in + sb, tag, __dlimit_char(dli), _file, _line); +} + -+static inline void __dl_adjust_block(struct super_block *sb, tag_t tag, ++static inline void __dl_adjust_block(struct super_block *sb, vtag_t tag, + unsigned long long *free_blocks, unsigned long long *root_blocks, + const char *_file, int _line) +{ @@ -9169,10 +7870,10 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_dlimit.h linux-3.7-vs2.3.5.1/in +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_inet.h linux-3.7-vs2.3.5.1/include/linux/vs_inet.h ---- linux-3.7/include/linux/vs_inet.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_inet.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,353 @@ +diff -urNp -x '*.orig' linux-4.9/include/linux/vs_inet.h linux-4.9/include/linux/vs_inet.h +--- linux-4.9/include/linux/vs_inet.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vs_inet.h 2021-02-24 15:47:45.097743096 +0100 +@@ -0,0 +1,364 @@ +#ifndef _VS_INET_H +#define _VS_INET_H + @@ -9234,6 +7935,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet.h linux-3.7-vs2.3.5.1/incl +int v4_addr_in_nx_info(struct nx_info *nxi, __be32 addr, uint16_t tmask) +{ + struct nx_addr_v4 *nxa; ++ unsigned long irqflags; + int ret = 1; + + if (!nxi) @@ -9256,11 +7958,15 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet.h linux-3.7-vs2.3.5.1/incl + (nxi->v4_bcast.s_addr == addr)) + goto out; + ret = 5; ++ + /* check for v4 addresses */ ++ spin_lock_irqsave(&nxi->addr_lock, irqflags); + for (nxa = &nxi->v4; nxa; nxa = nxa->next) + if (v4_addr_match(nxa, addr, tmask)) -+ goto out; ++ goto out_unlock; + ret = 0; ++out_unlock: ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); +out: + vxdprintk(VXD_CBIT(net, 0), + "v4_addr_in_nx_info(%p[#%u]," NIPQUAD_FMT ",%04x) = %d", @@ -9279,11 +7985,17 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet.h linux-3.7-vs2.3.5.1/incl +int v4_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v4 *nxa, uint16_t mask) +{ + struct nx_addr_v4 *ptr; ++ unsigned long irqflags; ++ int ret = 1; + ++ spin_lock_irqsave(&nxi->addr_lock, irqflags); + for (ptr = &nxi->v4; ptr; ptr = ptr->next) + if (v4_nx_addr_match(ptr, nxa, mask)) -+ return 1; -+ return 0; ++ goto out_unlock; ++ ret = 0; ++out_unlock: ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); ++ return ret; +} + +#include @@ -9342,7 +8054,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet.h linux-3.7-vs2.3.5.1/incl +int __v4_addr_match_socket(const struct sock *sk, struct nx_addr_v4 *nxa) +{ + struct nx_info *nxi = sk->sk_nx_info; -+ __be32 saddr = sk_rcv_saddr(sk); ++ __be32 saddr = sk->sk_rcv_saddr; + + vxdprintk(VXD_CBIT(net, 5), + "__v4_addr_in_socket(%p," NXAV4_FMT ") %p:" NIPQUAD_FMT " %p;%lx", @@ -9526,10 +8238,10 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet.h linux-3.7-vs2.3.5.1/incl +#else +// #warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_inet6.h linux-3.7-vs2.3.5.1/include/linux/vs_inet6.h ---- linux-3.7/include/linux/vs_inet6.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_inet6.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,246 @@ +diff -urNp -x '*.orig' linux-4.9/include/linux/vs_inet6.h linux-4.9/include/linux/vs_inet6.h +--- linux-4.9/include/linux/vs_inet6.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vs_inet6.h 2021-02-24 15:47:45.097743096 +0100 +@@ -0,0 +1,264 @@ +#ifndef _VS_INET6_H +#define _VS_INET6_H + @@ -9573,14 +8285,19 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet6.h linux-3.7-vs2.3.5.1/inc + const struct in6_addr *addr, uint16_t mask) +{ + struct nx_addr_v6 *nxa; ++ unsigned long irqflags; + int ret = 1; + + if (!nxi) + goto out; ++ ++ spin_lock_irqsave(&nxi->addr_lock, irqflags); + for (nxa = &nxi->v6; nxa; nxa = nxa->next) + if (v6_addr_match(nxa, addr, mask)) -+ goto out; ++ goto out_unlock; + ret = 0; ++out_unlock: ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); +out: + vxdprintk(VXD_CBIT(net, 0), + "v6_addr_in_nx_info(%p[#%u],%pI6,%04x) = %d", @@ -9599,11 +8316,17 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet6.h linux-3.7-vs2.3.5.1/inc +int v6_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v6 *nxa, uint16_t mask) +{ + struct nx_addr_v6 *ptr; ++ unsigned long irqflags; ++ int ret = 1; + ++ spin_lock_irqsave(&nxi->addr_lock, irqflags); + for (ptr = &nxi->v6; ptr; ptr = ptr->next) + if (v6_nx_addr_match(ptr, nxa, mask)) -+ return 1; -+ return 0; ++ goto out_unlock; ++ ret = 0; ++out_unlock: ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); ++ return ret; +} + + @@ -9620,7 +8343,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet6.h linux-3.7-vs2.3.5.1/inc + struct in6_addr *addr) +{ + struct sock *sk = &inet->sk; -+ struct in6_addr *saddr = inet6_rcv_saddr(sk); ++ const struct in6_addr *saddr = inet6_rcv_saddr(sk); + + if (!ipv6_addr_any(addr) && + ipv6_addr_equal(saddr, addr)) @@ -9641,7 +8364,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet6.h linux-3.7-vs2.3.5.1/inc +int __v6_addr_match_socket(const struct sock *sk, struct nx_addr_v6 *nxa) +{ + struct nx_info *nxi = sk->sk_nx_info; -+ struct in6_addr *saddr = inet6_rcv_saddr(sk); ++ const struct in6_addr *saddr = inet6_rcv_saddr(sk); + + vxdprintk(VXD_CBIT(net, 5), + "__v6_addr_in_socket(%p," NXAV6_FMT ") %p:%pI6 %p;%lx", @@ -9768,6 +8491,13 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet6.h linux-3.7-vs2.3.5.1/inc + return 0; +} + ++static inline ++int v6_addr_in_nx_info(struct nx_info *nxi, ++ const struct in6_addr *addr, uint16_t mask) ++{ ++ return 0; ++} ++ +#endif /* CONFIG_IPV6 */ + +#define current_nx_info_has_v6() \ @@ -9776,9 +8506,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_inet6.h linux-3.7-vs2.3.5.1/inc +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_limit.h linux-3.7-vs2.3.5.1/include/linux/vs_limit.h ---- linux-3.7/include/linux/vs_limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_limit.h 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/include/linux/vs_limit.h linux-4.9/include/linux/vs_limit.h +--- linux-4.9/include/linux/vs_limit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vs_limit.h 2021-02-24 15:47:45.101076533 +0100 @@ -0,0 +1,140 @@ +#ifndef _VS_LIMIT_H +#define _VS_LIMIT_H @@ -9856,12 +8586,12 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_limit.h linux-3.7-vs2.3.5.1/inc +/* dentry limits */ + +#define vx_dentry_inc(d) do { \ -+ if ((d)->d_count == 1) \ ++ if (d_count(d) == 1) \ + vx_acc_cres(current_vx_info(), 1, d, VLIMIT_DENTRY); \ + } while (0) + +#define vx_dentry_dec(d) do { \ -+ if ((d)->d_count == 0) \ ++ if (d_count(d) == 0) \ + vx_acc_cres(current_vx_info(),-1, d, VLIMIT_DENTRY); \ + } while (0) + @@ -9920,9 +8650,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_limit.h linux-3.7-vs2.3.5.1/inc +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_network.h linux-3.7-vs2.3.5.1/include/linux/vs_network.h ---- linux-3.7/include/linux/vs_network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_network.h 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/include/linux/vs_network.h linux-4.9/include/linux/vs_network.h +--- linux-4.9/include/linux/vs_network.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vs_network.h 2021-02-24 15:47:45.101076533 +0100 @@ -0,0 +1,169 @@ +#ifndef _NX_VS_NETWORK_H +#define _NX_VS_NETWORK_H @@ -10093,9 +8823,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_network.h linux-3.7-vs2.3.5.1/i +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_pid.h linux-3.7-vs2.3.5.1/include/linux/vs_pid.h ---- linux-3.7/include/linux/vs_pid.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_pid.h 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/include/linux/vs_pid.h linux-4.9/include/linux/vs_pid.h +--- linux-4.9/include/linux/vs_pid.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vs_pid.h 2021-02-24 15:47:45.101076533 +0100 @@ -0,0 +1,50 @@ +#ifndef _VS_PID_H +#define _VS_PID_H @@ -10147,9 +8877,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_pid.h linux-3.7-vs2.3.5.1/inclu +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_sched.h linux-3.7-vs2.3.5.1/include/linux/vs_sched.h ---- linux-3.7/include/linux/vs_sched.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_sched.h 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/include/linux/vs_sched.h linux-4.9/include/linux/vs_sched.h +--- linux-4.9/include/linux/vs_sched.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vs_sched.h 2021-02-24 15:47:45.101076533 +0100 @@ -0,0 +1,40 @@ +#ifndef _VS_SCHED_H +#define _VS_SCHED_H @@ -10191,9 +8921,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_sched.h linux-3.7-vs2.3.5.1/inc +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_socket.h linux-3.7-vs2.3.5.1/include/linux/vs_socket.h ---- linux-3.7/include/linux/vs_socket.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_socket.h 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/include/linux/vs_socket.h linux-4.9/include/linux/vs_socket.h +--- linux-4.9/include/linux/vs_socket.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vs_socket.h 2021-02-24 15:47:45.101076533 +0100 @@ -0,0 +1,67 @@ +#ifndef _VS_SOCKET_H +#define _VS_SOCKET_H @@ -10262,9 +8992,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_socket.h linux-3.7-vs2.3.5.1/in +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_tag.h linux-3.7-vs2.3.5.1/include/linux/vs_tag.h ---- linux-3.7/include/linux/vs_tag.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_tag.h 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/include/linux/vs_tag.h linux-4.9/include/linux/vs_tag.h +--- linux-4.9/include/linux/vs_tag.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vs_tag.h 2021-02-24 15:47:45.101076533 +0100 @@ -0,0 +1,47 @@ +#ifndef _VS_TAG_H +#define _VS_TAG_H @@ -10295,7 +9025,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_tag.h linux-3.7-vs2.3.5.1/inclu + * check current context for ADMIN/WATCH and + * optionally against supplied argument + */ -+static inline int __dx_check(tag_t cid, tag_t id, unsigned int mode) ++static inline int __dx_check(vtag_t cid, vtag_t id, unsigned int mode) +{ + if (mode & DX_ARG_MASK) { + if ((mode & DX_IDENT) && (id == cid)) @@ -10313,10 +9043,10 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_tag.h linux-3.7-vs2.3.5.1/inclu +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vs_time.h linux-3.7-vs2.3.5.1/include/linux/vs_time.h ---- linux-3.7/include/linux/vs_time.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vs_time.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,19 @@ +diff -urNp -x '*.orig' linux-4.9/include/linux/vs_time.h linux-4.9/include/linux/vs_time.h +--- linux-4.9/include/linux/vs_time.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vs_time.h 2021-02-24 15:47:45.101076533 +0100 +@@ -0,0 +1,21 @@ +#ifndef _VS_TIME_H +#define _VS_TIME_H + @@ -10327,33 +9057,23 @@ diff -NurpP --minimal linux-3.7/include/linux/vs_time.h linux-3.7-vs2.3.5.1/incl + +extern void vx_adjust_timespec(struct timespec *ts); +extern int vx_settimeofday(const struct timespec *ts); ++extern int vx_settimeofday64(const struct timespec64 *ts); + +#else +#define vx_adjust_timespec(t) do { } while (0) +#define vx_settimeofday(t) do_settimeofday(t) ++#define vx_settimeofday64(t) do_settimeofday64(t) +#endif + +#else +#warning duplicate inclusion +#endif -diff -NurpP --minimal linux-3.7/include/linux/vserver/Kbuild linux-3.7-vs2.3.5.1/include/linux/vserver/Kbuild ---- linux-3.7/include/linux/vserver/Kbuild 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/Kbuild 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,8 @@ -+ -+header-y += context_cmd.h network_cmd.h space_cmd.h \ -+ cacct_cmd.h cvirt_cmd.h limit_cmd.h dlimit_cmd.h \ -+ inode_cmd.h tag_cmd.h sched_cmd.h signal_cmd.h \ -+ debug_cmd.h device_cmd.h -+ -+header-y += switch.h network.h monitor.h inode.h device.h -+ -diff -NurpP --minimal linux-3.7/include/linux/vserver/base.h linux-3.7-vs2.3.5.1/include/linux/vserver/base.h ---- linux-3.7/include/linux/vserver/base.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/base.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,178 @@ -+#ifndef _VX_BASE_H -+#define _VX_BASE_H +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/base.h linux-4.9/include/linux/vserver/base.h +--- linux-4.9/include/linux/vserver/base.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/base.h 2021-02-24 15:47:45.094409658 +0100 +@@ -0,0 +1,184 @@ ++#ifndef _VSERVER_BASE_H ++#define _VSERVER_BASE_H + + +/* context state changes */ @@ -10497,6 +9217,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/base.h linux-3.7-vs2.3.5.1 +#define nx_capable(b, c) (capable(b) || \ + (cap_raised(current_cap(), b) && nx_ncaps(c))) + ++#define nx_ns_capable(n, b, c) (ns_capable(n, b) || \ ++ (cap_raised(current_cap(), b) && nx_ncaps(c))) ++ +#define vx_task_initpid(t, n) \ + ((t)->vx_info && \ + ((t)->vx_info->vx_initpid == (n))) @@ -10514,6 +9237,9 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/base.h linux-3.7-vs2.3.5.1 + (cap_raised(current_cap(), b) && \ + !((f) & ~vx_current_umask()))) + ++#define vx_ns_can_unshare(n, b, f) (ns_capable(n, b) || \ ++ (cap_raised(current_cap(), b) && \ ++ !((f) & ~vx_current_umask()))) + +#define __vx_wmask(v) ((v)->vx_wmask) + @@ -10530,12 +9256,12 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/base.h linux-3.7-vs2.3.5.1 +#define nx_info_state(n, m) (__nx_state(n) & (m)) + +#endif -diff -NurpP --minimal linux-3.7/include/linux/vserver/cacct.h linux-3.7-vs2.3.5.1/include/linux/vserver/cacct.h ---- linux-3.7/include/linux/vserver/cacct.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/cacct.h 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/cacct.h linux-4.9/include/linux/vserver/cacct.h +--- linux-4.9/include/linux/vserver/cacct.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/cacct.h 2021-02-24 15:47:45.094409658 +0100 @@ -0,0 +1,15 @@ -+#ifndef _VX_CACCT_H -+#define _VX_CACCT_H ++#ifndef _VSERVER_CACCT_H ++#define _VSERVER_CACCT_H + + +enum sock_acc_field { @@ -10548,40 +9274,27 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/cacct.h linux-3.7-vs2.3.5. + VXA_SOCK_SIZE /* array size */ +}; + -+#endif /* _VX_CACCT_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/cacct_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/cacct_cmd.h ---- linux-3.7/include/linux/vserver/cacct_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/cacct_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,23 @@ -+#ifndef _VX_CACCT_CMD_H -+#define _VX_CACCT_CMD_H -+ -+ -+/* virtual host info name commands */ -+ -+#define VCMD_sock_stat VC_CMD(VSTAT, 5, 0) -+ -+struct vcmd_sock_stat_v0 { -+ uint32_t field; -+ uint32_t count[3]; -+ uint64_t total[3]; -+}; -+ ++#endif /* _VSERVER_CACCT_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/cacct_cmd.h linux-4.9/include/linux/vserver/cacct_cmd.h +--- linux-4.9/include/linux/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/cacct_cmd.h 2021-02-24 15:47:45.094409658 +0100 +@@ -0,0 +1,10 @@ ++#ifndef _VSERVER_CACCT_CMD_H ++#define _VSERVER_CACCT_CMD_H + -+#ifdef __KERNEL__ + +#include ++#include + +extern int vc_sock_stat(struct vx_info *, void __user *); + -+#endif /* __KERNEL__ */ -+#endif /* _VX_CACCT_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/cacct_def.h linux-3.7-vs2.3.5.1/include/linux/vserver/cacct_def.h ---- linux-3.7/include/linux/vserver/cacct_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/cacct_def.h 2012-12-11 15:56:32.000000000 +0000 ++#endif /* _VSERVER_CACCT_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/cacct_def.h linux-4.9/include/linux/vserver/cacct_def.h +--- linux-4.9/include/linux/vserver/cacct_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/cacct_def.h 2021-02-24 15:47:45.094409658 +0100 @@ -0,0 +1,43 @@ -+#ifndef _VX_CACCT_DEF_H -+#define _VX_CACCT_DEF_H ++#ifndef _VSERVER_CACCT_DEF_H ++#define _VSERVER_CACCT_DEF_H + +#include +#include @@ -10622,16 +9335,13 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/cacct_def.h linux-3.7-vs2. + +#endif + -+#endif /* _VX_CACCT_DEF_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/cacct_int.h linux-3.7-vs2.3.5.1/include/linux/vserver/cacct_int.h ---- linux-3.7/include/linux/vserver/cacct_int.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/cacct_int.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,21 @@ -+#ifndef _VX_CACCT_INT_H -+#define _VX_CACCT_INT_H -+ -+ -+#ifdef __KERNEL__ ++#endif /* _VSERVER_CACCT_DEF_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/cacct_int.h linux-4.9/include/linux/vserver/cacct_int.h +--- linux-4.9/include/linux/vserver/cacct_int.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/cacct_int.h 2021-02-24 15:47:45.094409658 +0100 +@@ -0,0 +1,17 @@ ++#ifndef _VSERVER_CACCT_INT_H ++#define _VSERVER_CACCT_INT_H + +static inline +unsigned long vx_sock_count(struct _vx_cacct *cacct, int type, int pos) @@ -10646,14 +9356,13 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/cacct_int.h linux-3.7-vs2. + return atomic_long_read(&cacct->sock[type][pos].total); +} + -+#endif /* __KERNEL__ */ -+#endif /* _VX_CACCT_INT_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/check.h linux-3.7-vs2.3.5.1/include/linux/vserver/check.h ---- linux-3.7/include/linux/vserver/check.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/check.h 2012-12-11 15:56:32.000000000 +0000 ++#endif /* _VSERVER_CACCT_INT_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/check.h linux-4.9/include/linux/vserver/check.h +--- linux-4.9/include/linux/vserver/check.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/check.h 2021-02-24 15:47:45.094409658 +0100 @@ -0,0 +1,89 @@ -+#ifndef _VS_CHECK_H -+#define _VS_CHECK_H ++#ifndef _VSERVER_CHECK_H ++#define _VSERVER_CHECK_H + + +#define MAX_S_CONTEXT 65535 /* Arbitrary limit */ @@ -10741,95 +9450,18 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/check.h linux-3.7-vs2.3.5. +#define nx_weak_check(c, m) ((m) ? nx_check(c, m) : 1) + +#endif -diff -NurpP --minimal linux-3.7/include/linux/vserver/context.h linux-3.7-vs2.3.5.1/include/linux/vserver/context.h ---- linux-3.7/include/linux/vserver/context.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/context.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,188 @@ -+#ifndef _VX_CONTEXT_H -+#define _VX_CONTEXT_H -+ -+#include -+#include -+ -+ -+/* context flags */ -+ -+#define VXF_INFO_SCHED 0x00000002 -+#define VXF_INFO_NPROC 0x00000004 -+#define VXF_INFO_PRIVATE 0x00000008 -+ -+#define VXF_INFO_INIT 0x00000010 -+#define VXF_INFO_HIDE 0x00000020 -+#define VXF_INFO_ULIMIT 0x00000040 -+#define VXF_INFO_NSPACE 0x00000080 -+ -+#define VXF_SCHED_HARD 0x00000100 -+#define VXF_SCHED_PRIO 0x00000200 -+#define VXF_SCHED_PAUSE 0x00000400 -+ -+#define VXF_VIRT_MEM 0x00010000 -+#define VXF_VIRT_UPTIME 0x00020000 -+#define VXF_VIRT_CPU 0x00040000 -+#define VXF_VIRT_LOAD 0x00080000 -+#define VXF_VIRT_TIME 0x00100000 -+ -+#define VXF_HIDE_MOUNT 0x01000000 -+/* was VXF_HIDE_NETIF 0x02000000 */ -+#define VXF_HIDE_VINFO 0x04000000 -+ -+#define VXF_STATE_SETUP (1ULL << 32) -+#define VXF_STATE_INIT (1ULL << 33) -+#define VXF_STATE_ADMIN (1ULL << 34) -+ -+#define VXF_SC_HELPER (1ULL << 36) -+#define VXF_REBOOT_KILL (1ULL << 37) -+#define VXF_PERSISTENT (1ULL << 38) -+ -+#define VXF_FORK_RSS (1ULL << 48) -+#define VXF_PROLIFIC (1ULL << 49) -+ -+#define VXF_IGNEG_NICE (1ULL << 52) -+ -+#define VXF_ONE_TIME (0x0007ULL << 32) -+ -+#define VXF_INIT_SET (VXF_STATE_SETUP | VXF_STATE_INIT | VXF_STATE_ADMIN) -+ -+ -+/* context migration */ -+ -+#define VXM_SET_INIT 0x00000001 -+#define VXM_SET_REAPER 0x00000002 -+ -+/* context caps */ -+ -+#define VXC_SET_UTSNAME 0x00000001 -+#define VXC_SET_RLIMIT 0x00000002 -+#define VXC_FS_SECURITY 0x00000004 -+#define VXC_FS_TRUSTED 0x00000008 -+#define VXC_TIOCSTI 0x00000010 -+ -+/* was VXC_RAW_ICMP 0x00000100 */ -+#define VXC_SYSLOG 0x00001000 -+#define VXC_OOM_ADJUST 0x00002000 -+#define VXC_AUDIT_CONTROL 0x00004000 -+ -+#define VXC_SECURE_MOUNT 0x00010000 -+#define VXC_SECURE_REMOUNT 0x00020000 -+#define VXC_BINARY_MOUNT 0x00040000 +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/context.h linux-4.9/include/linux/vserver/context.h +--- linux-4.9/include/linux/vserver/context.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/context.h 2021-02-24 15:47:45.094409658 +0100 +@@ -0,0 +1,110 @@ ++#ifndef _VSERVER_CONTEXT_H ++#define _VSERVER_CONTEXT_H + -+#define VXC_QUOTA_CTL 0x00100000 -+#define VXC_ADMIN_MAPPER 0x00200000 -+#define VXC_ADMIN_CLOOP 0x00400000 -+ -+#define VXC_KTHREAD 0x01000000 -+#define VXC_NAMESPACE 0x02000000 -+ -+ -+#ifdef __KERNEL__ + +#include +#include +#include ++#include + +#include "limit_def.h" +#include "sched_def.h" @@ -10853,7 +9485,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/context.h linux-3.7-vs2.3. + +struct vx_info { + struct hlist_node vx_hlist; /* linked list of contexts */ -+ xid_t vx_id; /* context id */ ++ vxid_t vx_id; /* context id */ + atomic_t vx_usecnt; /* usage count */ + atomic_t vx_tasks; /* tasks count */ + struct vx_info *vx_parent; /* parent context */ @@ -10904,7 +9536,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/context.h linux-3.7-vs2.3. + +struct vx_info_save { + struct vx_info *vxi; -+ xid_t xid; ++ vxid_t xid; +}; + + @@ -10924,315 +9556,134 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/context.h linux-3.7-vs2.3. +extern struct vx_info *lookup_or_create_vx_info(int); + +extern int get_xid_list(int, unsigned int *, int); -+extern int xid_is_hashed(xid_t); ++extern int xid_is_hashed(vxid_t); + +extern int vx_migrate_task(struct task_struct *, struct vx_info *, int); + +extern long vs_state_change(struct vx_info *, unsigned int); + + -+#endif /* __KERNEL__ */ -+#endif /* _VX_CONTEXT_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/context_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/context_cmd.h ---- linux-3.7/include/linux/vserver/context_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/context_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,162 @@ -+#ifndef _VX_CONTEXT_CMD_H -+#define _VX_CONTEXT_CMD_H -+ -+ -+/* vinfo commands */ ++#endif /* _VSERVER_CONTEXT_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/context_cmd.h linux-4.9/include/linux/vserver/context_cmd.h +--- linux-4.9/include/linux/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/context_cmd.h 2021-02-24 15:47:45.094409658 +0100 +@@ -0,0 +1,33 @@ ++#ifndef _VSERVER_CONTEXT_CMD_H ++#define _VSERVER_CONTEXT_CMD_H + -+#define VCMD_task_xid VC_CMD(VINFO, 1, 0) ++#include + -+#ifdef __KERNEL__ +extern int vc_task_xid(uint32_t); + -+#endif /* __KERNEL__ */ ++extern int vc_vx_info(struct vx_info *, void __user *); + -+#define VCMD_vx_info VC_CMD(VINFO, 5, 0) ++extern int vc_ctx_stat(struct vx_info *, void __user *); + -+struct vcmd_vx_info_v0 { -+ uint32_t xid; -+ uint32_t initpid; -+ /* more to come */ -+}; ++extern int vc_ctx_create(uint32_t, void __user *); ++extern int vc_ctx_migrate(struct vx_info *, void __user *); + -+#ifdef __KERNEL__ -+extern int vc_vx_info(struct vx_info *, void __user *); ++extern int vc_get_cflags(struct vx_info *, void __user *); ++extern int vc_set_cflags(struct vx_info *, void __user *); + -+#endif /* __KERNEL__ */ ++extern int vc_get_ccaps(struct vx_info *, void __user *); ++extern int vc_set_ccaps(struct vx_info *, void __user *); + -+#define VCMD_ctx_stat VC_CMD(VSTAT, 0, 0) ++extern int vc_get_bcaps(struct vx_info *, void __user *); ++extern int vc_set_bcaps(struct vx_info *, void __user *); + -+struct vcmd_ctx_stat_v0 { -+ uint32_t usecnt; -+ uint32_t tasks; -+ /* more to come */ -+}; ++extern int vc_get_umask(struct vx_info *, void __user *); ++extern int vc_set_umask(struct vx_info *, void __user *); + -+#ifdef __KERNEL__ -+extern int vc_ctx_stat(struct vx_info *, void __user *); ++extern int vc_get_wmask(struct vx_info *, void __user *); ++extern int vc_set_wmask(struct vx_info *, void __user *); + -+#endif /* __KERNEL__ */ ++extern int vc_get_badness(struct vx_info *, void __user *); ++extern int vc_set_badness(struct vx_info *, void __user *); + -+/* context commands */ ++#endif /* _VSERVER_CONTEXT_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/cvirt.h linux-4.9/include/linux/vserver/cvirt.h +--- linux-4.9/include/linux/vserver/cvirt.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/cvirt.h 2021-02-24 15:47:45.094409658 +0100 +@@ -0,0 +1,11 @@ ++#ifndef _VSERVER_CVIRT_H ++#define _VSERVER_CVIRT_H + -+#define VCMD_ctx_create_v0 VC_CMD(VPROC, 1, 0) -+#define VCMD_ctx_create VC_CMD(VPROC, 1, 1) ++struct vx_info; + -+struct vcmd_ctx_create { -+ uint64_t flagword; -+}; ++void vx_update_load(struct vx_info *); + -+#define VCMD_ctx_migrate_v0 VC_CMD(PROCMIG, 1, 0) -+#define VCMD_ctx_migrate VC_CMD(PROCMIG, 1, 1) + -+struct vcmd_ctx_migrate { -+ uint64_t flagword; -+}; ++int vx_do_syslog(int, char __user *, int); + -+#ifdef __KERNEL__ -+extern int vc_ctx_create(uint32_t, void __user *); -+extern int vc_ctx_migrate(struct vx_info *, void __user *); ++#endif /* _VSERVER_CVIRT_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/cvirt_cmd.h linux-4.9/include/linux/vserver/cvirt_cmd.h +--- linux-4.9/include/linux/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/cvirt_cmd.h 2021-02-24 15:47:45.094409658 +0100 +@@ -0,0 +1,13 @@ ++#ifndef _VSERVER_CVIRT_CMD_H ++#define _VSERVER_CVIRT_CMD_H + -+#endif /* __KERNEL__ */ + ++#include ++#include + -+/* flag commands */ ++extern int vc_set_vhi_name(struct vx_info *, void __user *); ++extern int vc_get_vhi_name(struct vx_info *, void __user *); + -+#define VCMD_get_cflags VC_CMD(FLAGS, 1, 0) -+#define VCMD_set_cflags VC_CMD(FLAGS, 2, 0) ++extern int vc_virt_stat(struct vx_info *, void __user *); + -+struct vcmd_ctx_flags_v0 { -+ uint64_t flagword; -+ uint64_t mask; -+}; ++#endif /* _VSERVER_CVIRT_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/cvirt_def.h linux-4.9/include/linux/vserver/cvirt_def.h +--- linux-4.9/include/linux/vserver/cvirt_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/cvirt_def.h 2021-02-24 15:47:45.094409658 +0100 +@@ -0,0 +1,80 @@ ++#ifndef _VSERVER_CVIRT_DEF_H ++#define _VSERVER_CVIRT_DEF_H + -+#ifdef __KERNEL__ -+extern int vc_get_cflags(struct vx_info *, void __user *); -+extern int vc_set_cflags(struct vx_info *, void __user *); ++#include ++#include ++#include ++#include ++#include + -+#endif /* __KERNEL__ */ + ++struct _vx_usage_stat { ++ uint64_t user; ++ uint64_t nice; ++ uint64_t system; ++ uint64_t softirq; ++ uint64_t irq; ++ uint64_t idle; ++ uint64_t iowait; ++}; + -+/* context caps commands */ ++struct _vx_syslog { ++ wait_queue_head_t log_wait; ++ spinlock_t logbuf_lock; /* lock for the log buffer */ + -+#define VCMD_get_ccaps VC_CMD(FLAGS, 3, 1) -+#define VCMD_set_ccaps VC_CMD(FLAGS, 4, 1) ++ unsigned long log_start; /* next char to be read by syslog() */ ++ unsigned long con_start; /* next char to be sent to consoles */ ++ unsigned long log_end; /* most-recently-written-char + 1 */ ++ unsigned long logged_chars; /* #chars since last read+clear operation */ + -+struct vcmd_ctx_caps_v1 { -+ uint64_t ccaps; -+ uint64_t cmask; ++ char log_buf[1024]; +}; + -+#ifdef __KERNEL__ -+extern int vc_get_ccaps(struct vx_info *, void __user *); -+extern int vc_set_ccaps(struct vx_info *, void __user *); + -+#endif /* __KERNEL__ */ ++/* context sub struct */ + ++struct _vx_cvirt { ++ atomic_t nr_threads; /* number of current threads */ ++ atomic_t nr_running; /* number of running threads */ ++ atomic_t nr_uninterruptible; /* number of uninterruptible threads */ + -+/* bcaps commands */ ++ atomic_t nr_onhold; /* processes on hold */ ++ uint32_t onhold_last; /* jiffies when put on hold */ + -+#define VCMD_get_bcaps VC_CMD(FLAGS, 9, 0) -+#define VCMD_set_bcaps VC_CMD(FLAGS, 10, 0) -+ -+struct vcmd_bcaps { -+ uint64_t bcaps; -+ uint64_t bmask; -+}; -+ -+#ifdef __KERNEL__ -+extern int vc_get_bcaps(struct vx_info *, void __user *); -+extern int vc_set_bcaps(struct vx_info *, void __user *); -+ -+#endif /* __KERNEL__ */ -+ -+ -+/* umask commands */ -+ -+#define VCMD_get_umask VC_CMD(FLAGS, 13, 0) -+#define VCMD_set_umask VC_CMD(FLAGS, 14, 0) -+ -+struct vcmd_umask { -+ uint64_t umask; -+ uint64_t mask; -+}; -+ -+#ifdef __KERNEL__ -+extern int vc_get_umask(struct vx_info *, void __user *); -+extern int vc_set_umask(struct vx_info *, void __user *); -+ -+#endif /* __KERNEL__ */ -+ -+ -+/* wmask commands */ -+ -+#define VCMD_get_wmask VC_CMD(FLAGS, 15, 0) -+#define VCMD_set_wmask VC_CMD(FLAGS, 16, 0) -+ -+struct vcmd_wmask { -+ uint64_t wmask; -+ uint64_t mask; -+}; -+ -+#ifdef __KERNEL__ -+extern int vc_get_wmask(struct vx_info *, void __user *); -+extern int vc_set_wmask(struct vx_info *, void __user *); -+ -+#endif /* __KERNEL__ */ -+ -+ -+/* OOM badness */ -+ -+#define VCMD_get_badness VC_CMD(MEMCTRL, 5, 0) -+#define VCMD_set_badness VC_CMD(MEMCTRL, 6, 0) -+ -+struct vcmd_badness_v0 { -+ int64_t bias; -+}; -+ -+#ifdef __KERNEL__ -+extern int vc_get_badness(struct vx_info *, void __user *); -+extern int vc_set_badness(struct vx_info *, void __user *); -+ -+#endif /* __KERNEL__ */ -+#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/cvirt.h linux-3.7-vs2.3.5.1/include/linux/vserver/cvirt.h ---- linux-3.7/include/linux/vserver/cvirt.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/cvirt.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,22 @@ -+#ifndef _VX_CVIRT_H -+#define _VX_CVIRT_H -+ -+ -+#ifdef __KERNEL__ -+ -+struct timespec; -+ -+void vx_vsi_boottime(struct timespec *); -+ -+void vx_vsi_uptime(struct timespec *, struct timespec *); -+ -+ -+struct vx_info; -+ -+void vx_update_load(struct vx_info *); -+ -+ -+int vx_do_syslog(int, char __user *, int); -+ -+#endif /* __KERNEL__ */ -+#endif /* _VX_CVIRT_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/cvirt_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/cvirt_cmd.h ---- linux-3.7/include/linux/vserver/cvirt_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/cvirt_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,53 @@ -+#ifndef _VX_CVIRT_CMD_H -+#define _VX_CVIRT_CMD_H -+ -+ -+/* virtual host info name commands */ -+ -+#define VCMD_set_vhi_name VC_CMD(VHOST, 1, 0) -+#define VCMD_get_vhi_name VC_CMD(VHOST, 2, 0) -+ -+struct vcmd_vhi_name_v0 { -+ uint32_t field; -+ char name[65]; -+}; -+ -+ -+enum vhi_name_field { -+ VHIN_CONTEXT = 0, -+ VHIN_SYSNAME, -+ VHIN_NODENAME, -+ VHIN_RELEASE, -+ VHIN_VERSION, -+ VHIN_MACHINE, -+ VHIN_DOMAINNAME, -+}; -+ -+ -+#ifdef __KERNEL__ -+ -+#include -+ -+extern int vc_set_vhi_name(struct vx_info *, void __user *); -+extern int vc_get_vhi_name(struct vx_info *, void __user *); -+ -+#endif /* __KERNEL__ */ -+ -+#define VCMD_virt_stat VC_CMD(VSTAT, 3, 0) -+ -+struct vcmd_virt_stat_v0 { -+ uint64_t offset; -+ uint64_t uptime; -+ uint32_t nr_threads; -+ uint32_t nr_running; -+ uint32_t nr_uninterruptible; -+ uint32_t nr_onhold; -+ uint32_t nr_forks; -+ uint32_t load[3]; -+}; -+ -+#ifdef __KERNEL__ -+extern int vc_virt_stat(struct vx_info *, void __user *); -+ -+#endif /* __KERNEL__ */ -+#endif /* _VX_CVIRT_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/cvirt_def.h linux-3.7-vs2.3.5.1/include/linux/vserver/cvirt_def.h ---- linux-3.7/include/linux/vserver/cvirt_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/cvirt_def.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,80 @@ -+#ifndef _VX_CVIRT_DEF_H -+#define _VX_CVIRT_DEF_H -+ -+#include -+#include -+#include -+#include -+#include -+ -+ -+struct _vx_usage_stat { -+ uint64_t user; -+ uint64_t nice; -+ uint64_t system; -+ uint64_t softirq; -+ uint64_t irq; -+ uint64_t idle; -+ uint64_t iowait; -+}; -+ -+struct _vx_syslog { -+ wait_queue_head_t log_wait; -+ spinlock_t logbuf_lock; /* lock for the log buffer */ -+ -+ unsigned long log_start; /* next char to be read by syslog() */ -+ unsigned long con_start; /* next char to be sent to consoles */ -+ unsigned long log_end; /* most-recently-written-char + 1 */ -+ unsigned long logged_chars; /* #chars since last read+clear operation */ -+ -+ char log_buf[1024]; -+}; -+ -+ -+/* context sub struct */ -+ -+struct _vx_cvirt { -+ atomic_t nr_threads; /* number of current threads */ -+ atomic_t nr_running; /* number of running threads */ -+ atomic_t nr_uninterruptible; /* number of uninterruptible threads */ -+ -+ atomic_t nr_onhold; /* processes on hold */ -+ uint32_t onhold_last; /* jiffies when put on hold */ -+ -+ struct timespec bias_ts; /* time offset to the host */ -+ struct timespec bias_idle; -+ struct timespec bias_uptime; /* context creation point */ -+ uint64_t bias_clock; /* offset in clock_t */ ++ struct timespec64 bias_ts; /* time offset to the host */ ++ struct timespec64 bias_idle; ++ struct timespec64 bias_uptime; /* context creation point */ ++ uint64_t bias_clock; /* offset in clock_t */ + + spinlock_t load_lock; /* lock for the load averages */ + atomic_t load_updates; /* nr of load updates done so far */ @@ -11265,13 +9716,13 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/cvirt_def.h linux-3.7-vs2. + +#endif + -+#endif /* _VX_CVIRT_DEF_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/debug.h linux-3.7-vs2.3.5.1/include/linux/vserver/debug.h ---- linux-3.7/include/linux/vserver/debug.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/debug.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,145 @@ -+#ifndef _VX_DEBUG_H -+#define _VX_DEBUG_H ++#endif /* _VSERVER_CVIRT_DEF_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/debug.h linux-4.9/include/linux/vserver/debug.h +--- linux-4.9/include/linux/vserver/debug.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/debug.h 2021-02-24 15:47:45.094409658 +0100 +@@ -0,0 +1,146 @@ ++#ifndef _VSERVER_DEBUG_H ++#define _VSERVER_DEBUG_H + + +#define VXD_CBIT(n, m) (vs_debug_ ## n & (1 << (m))) @@ -11396,7 +9847,8 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/debug.h linux-3.7-vs2.3.5. +#define vxwprintk_task(c, f, x...) \ + vxwprintk(c, VX_WARN_TASK f, \ + current->comm, current->pid, \ -+ current->xid, current->nid, current->tag, ##x) ++ current->xid, current->nid, \ ++ current->tag, ##x) +#define vxwprintk_xid(c, f, x...) \ + vxwprintk(c, VX_WARN_XID f, current->xid, x) +#define vxwprintk_nid(c, f, x...) \ @@ -11414,36 +9866,16 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/debug.h linux-3.7-vs2.3.5. +#endif + + -+#endif /* _VX_DEBUG_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/debug_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/debug_cmd.h ---- linux-3.7/include/linux/vserver/debug_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/debug_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,58 @@ -+#ifndef _VX_DEBUG_CMD_H -+#define _VX_DEBUG_CMD_H -+ -+ -+/* debug commands */ -+ -+#define VCMD_dump_history VC_CMD(DEBUG, 1, 0) -+ -+#define VCMD_read_history VC_CMD(DEBUG, 5, 0) -+#define VCMD_read_monitor VC_CMD(DEBUG, 6, 0) -+ -+struct vcmd_read_history_v0 { -+ uint32_t index; -+ uint32_t count; -+ char __user *data; -+}; -+ -+struct vcmd_read_monitor_v0 { -+ uint32_t index; -+ uint32_t count; -+ char __user *data; -+}; ++#endif /* _VSERVER_DEBUG_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/debug_cmd.h linux-4.9/include/linux/vserver/debug_cmd.h +--- linux-4.9/include/linux/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/debug_cmd.h 2021-02-24 15:47:45.094409658 +0100 +@@ -0,0 +1,37 @@ ++#ifndef _VSERVER_DEBUG_CMD_H ++#define _VSERVER_DEBUG_CMD_H + ++#include + -+#ifdef __KERNEL__ + +#ifdef CONFIG_COMPAT + @@ -11475,48 +9907,29 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/debug_cmd.h linux-3.7-vs2. + +#endif /* CONFIG_COMPAT */ + -+#endif /* __KERNEL__ */ -+#endif /* _VX_DEBUG_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/device.h linux-3.7-vs2.3.5.1/include/linux/vserver/device.h ---- linux-3.7/include/linux/vserver/device.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/device.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,15 @@ -+#ifndef _VX_DEVICE_H -+#define _VX_DEVICE_H -+ -+ -+#define DATTR_CREATE 0x00000001 -+#define DATTR_OPEN 0x00000002 -+ -+#define DATTR_REMAP 0x00000010 ++#endif /* _VSERVER_DEBUG_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/device.h linux-4.9/include/linux/vserver/device.h +--- linux-4.9/include/linux/vserver/device.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/device.h 2021-02-24 15:47:45.094409658 +0100 +@@ -0,0 +1,9 @@ ++#ifndef _VSERVER_DEVICE_H ++#define _VSERVER_DEVICE_H + -+#define DATTR_MASK 0x00000013 + ++#include + -+#else /* _VX_DEVICE_H */ ++#else /* _VSERVER_DEVICE_H */ +#warning duplicate inclusion -+#endif /* _VX_DEVICE_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/device_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/device_cmd.h ---- linux-3.7/include/linux/vserver/device_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/device_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,44 @@ -+#ifndef _VX_DEVICE_CMD_H -+#define _VX_DEVICE_CMD_H -+ -+ -+/* device vserver commands */ -+ -+#define VCMD_set_mapping VC_CMD(DEVICE, 1, 0) -+#define VCMD_unset_mapping VC_CMD(DEVICE, 2, 0) -+ -+struct vcmd_set_mapping_v0 { -+ const char __user *device; -+ const char __user *target; -+ uint32_t flags; -+}; ++#endif /* _VSERVER_DEVICE_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/device_cmd.h linux-4.9/include/linux/vserver/device_cmd.h +--- linux-4.9/include/linux/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/device_cmd.h 2021-02-24 15:47:45.094409658 +0100 +@@ -0,0 +1,31 @@ ++#ifndef _VSERVER_DEVICE_CMD_H ++#define _VSERVER_DEVICE_CMD_H + ++#include + -+#ifdef __KERNEL__ + +#ifdef CONFIG_COMPAT + @@ -11542,14 +9955,13 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/device_cmd.h linux-3.7-vs2 + +#endif /* CONFIG_COMPAT */ + -+#endif /* __KERNEL__ */ -+#endif /* _VX_DEVICE_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/device_def.h linux-3.7-vs2.3.5.1/include/linux/vserver/device_def.h ---- linux-3.7/include/linux/vserver/device_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/device_def.h 2012-12-11 15:56:32.000000000 +0000 ++#endif /* _VSERVER_DEVICE_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/device_def.h linux-4.9/include/linux/vserver/device_def.h +--- linux-4.9/include/linux/vserver/device_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/device_def.h 2021-02-24 15:47:45.094409658 +0100 @@ -0,0 +1,17 @@ -+#ifndef _VX_DEVICE_DEF_H -+#define _VX_DEVICE_DEF_H ++#ifndef _VSERVER_DEVICE_DEF_H ++#define _VSERVER_DEVICE_DEF_H + +#include + @@ -11564,13 +9976,13 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/device_def.h linux-3.7-vs2 +#endif +}; + -+#endif /* _VX_DEVICE_DEF_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/dlimit.h linux-3.7-vs2.3.5.1/include/linux/vserver/dlimit.h ---- linux-3.7/include/linux/vserver/dlimit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/dlimit.h 2012-12-11 15:56:32.000000000 +0000 ++#endif /* _VSERVER_DEVICE_DEF_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/dlimit.h linux-4.9/include/linux/vserver/dlimit.h +--- linux-4.9/include/linux/vserver/dlimit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/dlimit.h 2021-02-24 15:47:45.094409658 +0100 @@ -0,0 +1,54 @@ -+#ifndef _VX_DLIMIT_H -+#define _VX_DLIMIT_H ++#ifndef _VSERVER_DLIMIT_H ++#define _VSERVER_DLIMIT_H + +#include "switch.h" + @@ -11589,7 +10001,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/dlimit.h linux-3.7-vs2.3.5 +struct dl_info { + struct hlist_node dl_hlist; /* linked list of contexts */ + struct rcu_head dl_rcu; /* the rcu head */ -+ tag_t dl_tag; /* context tag */ ++ vtag_t dl_tag; /* context tag */ + atomic_t dl_usecnt; /* usage count */ + atomic_t dl_refcnt; /* reference count */ + @@ -11610,7 +10022,7 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/dlimit.h linux-3.7-vs2.3.5 +extern void rcu_free_dl_info(struct rcu_head *); +extern void unhash_dl_info(struct dl_info *); + -+extern struct dl_info *locate_dl_info(struct super_block *, tag_t); ++extern struct dl_info *locate_dl_info(struct super_block *, vtag_t); + + +struct kstatfs; @@ -11620,32 +10032,30 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/dlimit.h linux-3.7-vs2.3.5 +typedef uint64_t dlsize_t; + +#endif /* __KERNEL__ */ -+#else /* _VX_DLIMIT_H */ ++#else /* _VSERVER_DLIMIT_H */ +#warning duplicate inclusion -+#endif /* _VX_DLIMIT_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/dlimit_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/dlimit_cmd.h ---- linux-3.7/include/linux/vserver/dlimit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/dlimit_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,109 @@ -+#ifndef _VX_DLIMIT_CMD_H -+#define _VX_DLIMIT_CMD_H ++#endif /* _VSERVER_DLIMIT_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/dlimit_cmd.h linux-4.9/include/linux/vserver/dlimit_cmd.h +--- linux-4.9/include/linux/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/dlimit_cmd.h 2021-02-24 15:47:45.094409658 +0100 +@@ -0,0 +1,46 @@ ++#ifndef _VSERVER_DLIMIT_CMD_H ++#define _VSERVER_DLIMIT_CMD_H + ++#include + -+/* dlimit vserver commands */ + -+#define VCMD_add_dlimit VC_CMD(DLIMIT, 1, 0) -+#define VCMD_rem_dlimit VC_CMD(DLIMIT, 2, 0) ++#ifdef CONFIG_COMPAT + -+#define VCMD_set_dlimit VC_CMD(DLIMIT, 5, 0) -+#define VCMD_get_dlimit VC_CMD(DLIMIT, 6, 0) ++#include + -+struct vcmd_ctx_dlimit_base_v0 { -+ const char __user *name; ++struct vcmd_ctx_dlimit_base_v0_x32 { ++ compat_uptr_t name_ptr; + uint32_t flags; +}; + -+struct vcmd_ctx_dlimit_v0 { -+ const char __user *name; ++struct vcmd_ctx_dlimit_v0_x32 { ++ compat_uptr_t name_ptr; + uint32_t space_used; /* used space in kbytes */ + uint32_t space_total; /* maximum space in kbytes */ + uint32_t inodes_used; /* used inodes */ @@ -11654,77 +10064,17 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/dlimit_cmd.h linux-3.7-vs2 + uint32_t flags; +}; + -+#define CDLIM_UNSET ((uint32_t)0UL) -+#define CDLIM_INFINITY ((uint32_t)~0UL) -+#define CDLIM_KEEP ((uint32_t)~1UL) ++#endif /* CONFIG_COMPAT */ + -+#define DLIME_UNIT 0 -+#define DLIME_KILO 1 -+#define DLIME_MEGA 2 -+#define DLIME_GIGA 3 ++#include + -+#define DLIMF_SHIFT 0x10 ++extern int vc_add_dlimit(uint32_t, void __user *); ++extern int vc_rem_dlimit(uint32_t, void __user *); + -+#define DLIMS_USED 0 -+#define DLIMS_TOTAL 2 ++extern int vc_set_dlimit(uint32_t, void __user *); ++extern int vc_get_dlimit(uint32_t, void __user *); + -+static inline -+uint64_t dlimit_space_32to64(uint32_t val, uint32_t flags, int shift) -+{ -+ int exp = (flags & DLIMF_SHIFT) ? -+ (flags >> shift) & DLIME_GIGA : DLIME_KILO; -+ return ((uint64_t)val) << (10 * exp); -+} -+ -+static inline -+uint32_t dlimit_space_64to32(uint64_t val, uint32_t *flags, int shift) -+{ -+ int exp = 0; -+ -+ if (*flags & DLIMF_SHIFT) { -+ while (val > (1LL << 32) && (exp < 3)) { -+ val >>= 10; -+ exp++; -+ } -+ *flags &= ~(DLIME_GIGA << shift); -+ *flags |= exp << shift; -+ } else -+ val >>= 10; -+ return val; -+} -+ -+#ifdef __KERNEL__ -+ -+#ifdef CONFIG_COMPAT -+ -+#include -+ -+struct vcmd_ctx_dlimit_base_v0_x32 { -+ compat_uptr_t name_ptr; -+ uint32_t flags; -+}; -+ -+struct vcmd_ctx_dlimit_v0_x32 { -+ compat_uptr_t name_ptr; -+ uint32_t space_used; /* used space in kbytes */ -+ uint32_t space_total; /* maximum space in kbytes */ -+ uint32_t inodes_used; /* used inodes */ -+ uint32_t inodes_total; /* maximum inodes */ -+ uint32_t reserved; /* reserved for root in % */ -+ uint32_t flags; -+}; -+ -+#endif /* CONFIG_COMPAT */ -+ -+#include -+ -+extern int vc_add_dlimit(uint32_t, void __user *); -+extern int vc_rem_dlimit(uint32_t, void __user *); -+ -+extern int vc_set_dlimit(uint32_t, void __user *); -+extern int vc_get_dlimit(uint32_t, void __user *); -+ -+#ifdef CONFIG_COMPAT ++#ifdef CONFIG_COMPAT + +extern int vc_add_dlimit_x32(uint32_t, void __user *); +extern int vc_rem_dlimit_x32(uint32_t, void __user *); @@ -11734,14 +10084,13 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/dlimit_cmd.h linux-3.7-vs2 + +#endif /* CONFIG_COMPAT */ + -+#endif /* __KERNEL__ */ -+#endif /* _VX_DLIMIT_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/global.h linux-3.7-vs2.3.5.1/include/linux/vserver/global.h ---- linux-3.7/include/linux/vserver/global.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/global.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,19 @@ -+#ifndef _VX_GLOBAL_H -+#define _VX_GLOBAL_H ++#endif /* _VSERVER_DLIMIT_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/global.h linux-4.9/include/linux/vserver/global.h +--- linux-4.9/include/linux/vserver/global.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/global.h 2021-02-24 15:47:45.094409658 +0100 +@@ -0,0 +1,20 @@ ++#ifndef _VSERVER_GLOBAL_H ++#define _VSERVER_GLOBAL_H + + +extern atomic_t vx_global_ctotal; @@ -11754,17 +10103,18 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/global.h linux-3.7-vs2.3.5 +extern atomic_t vs_global_fs; +extern atomic_t vs_global_mnt_ns; +extern atomic_t vs_global_uts_ns; ++extern atomic_t vs_global_ipc_ns; +extern atomic_t vs_global_user_ns; +extern atomic_t vs_global_pid_ns; + + -+#endif /* _VX_GLOBAL_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/history.h linux-3.7-vs2.3.5.1/include/linux/vserver/history.h ---- linux-3.7/include/linux/vserver/history.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/history.h 2012-12-11 15:56:32.000000000 +0000 ++#endif /* _VSERVER_GLOBAL_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/history.h linux-4.9/include/linux/vserver/history.h +--- linux-4.9/include/linux/vserver/history.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/history.h 2021-02-24 15:47:45.094409658 +0100 @@ -0,0 +1,197 @@ -+#ifndef _VX_HISTORY_H -+#define _VX_HISTORY_H ++#ifndef _VSERVER_HISTORY_H ++#define _VSERVER_HISTORY_H + + +enum { @@ -11959,28 +10309,15 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/history.h linux-3.7-vs2.3. + +#endif /* CONFIG_VSERVER_HISTORY */ + -+#endif /* _VX_HISTORY_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/inode.h linux-3.7-vs2.3.5.1/include/linux/vserver/inode.h ---- linux-3.7/include/linux/vserver/inode.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/inode.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,39 @@ -+#ifndef _VX_INODE_H -+#define _VX_INODE_H -+ -+ -+#define IATTR_TAG 0x01000000 -+ -+#define IATTR_ADMIN 0x00000001 -+#define IATTR_WATCH 0x00000002 -+#define IATTR_HIDE 0x00000004 -+#define IATTR_FLAGS 0x00000007 -+ -+#define IATTR_BARRIER 0x00010000 -+#define IATTR_IXUNLINK 0x00020000 -+#define IATTR_IMMUTABLE 0x00040000 -+#define IATTR_COW 0x00080000 ++#endif /* _VSERVER_HISTORY_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/inode.h linux-4.9/include/linux/vserver/inode.h +--- linux-4.9/include/linux/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/inode.h 2021-02-24 15:47:45.097743096 +0100 +@@ -0,0 +1,19 @@ ++#ifndef _VSERVER_INODE_H ++#define _VSERVER_INODE_H + -+#ifdef __KERNEL__ ++#include + + +#ifdef CONFIG_VSERVER_PROC_SECURE @@ -11993,47 +10330,18 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/inode.h linux-3.7-vs2.3.5. + +#define vx_hide_check(c, m) (((m) & IATTR_HIDE) ? vx_check(c, m) : 1) + -+#endif /* __KERNEL__ */ -+ -+/* inode ioctls */ -+ -+#define FIOC_GETXFLG _IOR('x', 5, long) -+#define FIOC_SETXFLG _IOW('x', 6, long) -+ -+#else /* _VX_INODE_H */ ++#else /* _VSERVER_INODE_H */ +#warning duplicate inclusion -+#endif /* _VX_INODE_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/inode_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/inode_cmd.h ---- linux-3.7/include/linux/vserver/inode_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/inode_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,59 @@ -+#ifndef _VX_INODE_CMD_H -+#define _VX_INODE_CMD_H -+ -+ -+/* inode vserver commands */ -+ -+#define VCMD_get_iattr VC_CMD(INODE, 1, 1) -+#define VCMD_set_iattr VC_CMD(INODE, 2, 1) -+ -+#define VCMD_fget_iattr VC_CMD(INODE, 3, 0) -+#define VCMD_fset_iattr VC_CMD(INODE, 4, 0) -+ -+struct vcmd_ctx_iattr_v1 { -+ const char __user *name; -+ uint32_t tag; -+ uint32_t flags; -+ uint32_t mask; -+}; -+ -+struct vcmd_ctx_fiattr_v0 { -+ uint32_t tag; -+ uint32_t flags; -+ uint32_t mask; -+}; ++#endif /* _VSERVER_INODE_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/inode_cmd.h linux-4.9/include/linux/vserver/inode_cmd.h +--- linux-4.9/include/linux/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/inode_cmd.h 2021-02-24 15:47:45.097743096 +0100 +@@ -0,0 +1,36 @@ ++#ifndef _VSERVER_INODE_CMD_H ++#define _VSERVER_INODE_CMD_H + ++#include + -+#ifdef __KERNEL__ + + +#ifdef CONFIG_COMPAT @@ -12064,26 +10372,16 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/inode_cmd.h linux-3.7-vs2. + +#endif /* CONFIG_COMPAT */ + -+#endif /* __KERNEL__ */ -+#endif /* _VX_INODE_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/limit.h linux-3.7-vs2.3.5.1/include/linux/vserver/limit.h ---- linux-3.7/include/linux/vserver/limit.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/limit.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,71 @@ -+#ifndef _VX_LIMIT_H -+#define _VX_LIMIT_H -+ -+#define VLIMIT_NSOCK 16 -+#define VLIMIT_OPENFD 17 -+#define VLIMIT_ANON 18 -+#define VLIMIT_SHMEM 19 -+#define VLIMIT_SEMARY 20 -+#define VLIMIT_NSEMS 21 -+#define VLIMIT_DENTRY 22 -+#define VLIMIT_MAPPED 23 ++#endif /* _VSERVER_INODE_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/limit.h linux-4.9/include/linux/vserver/limit.h +--- linux-4.9/include/linux/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/limit.h 2021-02-24 15:47:45.097743096 +0100 +@@ -0,0 +1,67 @@ ++#ifndef _VSERVER_LIMIT_H ++#define _VSERVER_LIMIT_H + ++#include + -+#ifdef __KERNEL__ + +#define VLIM_NOCHECK ((1L << VLIMIT_DENTRY) | (1L << RLIMIT_RSS)) + @@ -12133,58 +10431,28 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/limit.h linux-3.7-vs2.3.5. + +struct sysinfo; + ++#ifdef CONFIG_MEMCG +void vx_vsi_meminfo(struct sysinfo *); +void vx_vsi_swapinfo(struct sysinfo *); +long vx_vsi_cached(struct sysinfo *); ++#else /* !CONFIG_MEMCG */ ++#define vx_vsi_meminfo(s) do { } while (0) ++#define vx_vsi_swapinfo(s) do { } while (0) ++#define vx_vsi_cached(s) (0L) ++#endif /* !CONFIG_MEMCG */ + +#define NUM_LIMITS 24 + -+#endif /* __KERNEL__ */ -+#endif /* _VX_LIMIT_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/limit_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/limit_cmd.h ---- linux-3.7/include/linux/vserver/limit_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/limit_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,71 @@ -+#ifndef _VX_LIMIT_CMD_H -+#define _VX_LIMIT_CMD_H -+ -+ -+/* rlimit vserver commands */ -+ -+#define VCMD_get_rlimit VC_CMD(RLIMIT, 1, 0) -+#define VCMD_set_rlimit VC_CMD(RLIMIT, 2, 0) -+#define VCMD_get_rlimit_mask VC_CMD(RLIMIT, 3, 0) -+#define VCMD_reset_hits VC_CMD(RLIMIT, 7, 0) -+#define VCMD_reset_minmax VC_CMD(RLIMIT, 9, 0) -+ -+struct vcmd_ctx_rlimit_v0 { -+ uint32_t id; -+ uint64_t minimum; -+ uint64_t softlimit; -+ uint64_t maximum; -+}; -+ -+struct vcmd_ctx_rlimit_mask_v0 { -+ uint32_t minimum; -+ uint32_t softlimit; -+ uint32_t maximum; -+}; -+ -+#define VCMD_rlimit_stat VC_CMD(VSTAT, 1, 0) -+ -+struct vcmd_rlimit_stat_v0 { -+ uint32_t id; -+ uint32_t hits; -+ uint64_t value; -+ uint64_t minimum; -+ uint64_t maximum; -+}; ++#endif /* _VSERVER_LIMIT_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/limit_cmd.h linux-4.9/include/linux/vserver/limit_cmd.h +--- linux-4.9/include/linux/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/limit_cmd.h 2021-02-24 15:47:45.097743096 +0100 +@@ -0,0 +1,35 @@ ++#ifndef _VSERVER_LIMIT_CMD_H ++#define _VSERVER_LIMIT_CMD_H + -+#define CRLIM_UNSET (0ULL) -+#define CRLIM_INFINITY (~0ULL) -+#define CRLIM_KEEP (~1ULL) ++#include + -+#ifdef __KERNEL__ + +#ifdef CONFIG_IA32_EMULATION + @@ -12214,14 +10482,13 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/limit_cmd.h linux-3.7-vs2. + +#endif /* CONFIG_IA32_EMULATION */ + -+#endif /* __KERNEL__ */ -+#endif /* _VX_LIMIT_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/limit_def.h linux-3.7-vs2.3.5.1/include/linux/vserver/limit_def.h ---- linux-3.7/include/linux/vserver/limit_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/limit_def.h 2012-12-11 15:56:32.000000000 +0000 ++#endif /* _VSERVER_LIMIT_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/limit_def.h linux-4.9/include/linux/vserver/limit_def.h +--- linux-4.9/include/linux/vserver/limit_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/limit_def.h 2021-02-24 15:47:45.097743096 +0100 @@ -0,0 +1,47 @@ -+#ifndef _VX_LIMIT_DEF_H -+#define _VX_LIMIT_DEF_H ++#ifndef _VSERVER_LIMIT_DEF_H ++#define _VSERVER_LIMIT_DEF_H + +#include +#include @@ -12266,17 +10533,13 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/limit_def.h linux-3.7-vs2. + +#endif + -+#endif /* _VX_LIMIT_DEF_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/limit_int.h linux-3.7-vs2.3.5.1/include/linux/vserver/limit_int.h ---- linux-3.7/include/linux/vserver/limit_int.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/limit_int.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,198 @@ -+#ifndef _VX_LIMIT_INT_H -+#define _VX_LIMIT_INT_H -+ -+#include "context.h" -+ -+#ifdef __KERNEL__ ++#endif /* _VSERVER_LIMIT_DEF_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/limit_int.h linux-4.9/include/linux/vserver/limit_int.h +--- linux-4.9/include/linux/vserver/limit_int.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/limit_int.h 2021-02-24 15:47:45.097743096 +0100 +@@ -0,0 +1,193 @@ ++#ifndef _VSERVER_LIMIT_INT_H ++#define _VSERVER_LIMIT_INT_H + +#define VXD_RCRES_COND(r) VXD_CBIT(cres, r) +#define VXD_RLIMIT_COND(r) VXD_CBIT(limit, r) @@ -12467,91 +10730,1495 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/limit_int.h linux-3.7-vs2. +} + + -+#endif /* __KERNEL__ */ -+#endif /* _VX_LIMIT_INT_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/monitor.h linux-3.7-vs2.3.5.1/include/linux/vserver/monitor.h ---- linux-3.7/include/linux/vserver/monitor.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/monitor.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,96 @@ -+#ifndef _VX_MONITOR_H -+#define _VX_MONITOR_H ++#endif /* _VSERVER_LIMIT_INT_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/monitor.h linux-4.9/include/linux/vserver/monitor.h +--- linux-4.9/include/linux/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/monitor.h 2021-02-24 15:47:45.097743096 +0100 +@@ -0,0 +1,6 @@ ++#ifndef _VSERVER_MONITOR_H ++#define _VSERVER_MONITOR_H + -+#include ++#include + -+enum { -+ VXM_UNUSED = 0, ++#endif /* _VSERVER_MONITOR_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/network.h linux-4.9/include/linux/vserver/network.h +--- linux-4.9/include/linux/vserver/network.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/network.h 2021-02-24 15:47:45.097743096 +0100 +@@ -0,0 +1,76 @@ ++#ifndef _VSERVER_NETWORK_H ++#define _VSERVER_NETWORK_H + -+ VXM_SYNC = 0x10, + -+ VXM_UPDATE = 0x20, -+ VXM_UPDATE_1, -+ VXM_UPDATE_2, ++#include ++#include ++#include ++#include ++#include ++#include ++#include + -+ VXM_RQINFO_1 = 0x24, -+ VXM_RQINFO_2, ++struct nx_addr_v4 { ++ struct nx_addr_v4 *next; ++ struct in_addr ip[2]; ++ struct in_addr mask; ++ uint16_t type; ++ uint16_t flags; ++}; + -+ VXM_ACTIVATE = 0x40, -+ VXM_DEACTIVATE, -+ VXM_IDLE, ++struct nx_addr_v6 { ++ struct nx_addr_v6 *next; ++ struct in6_addr ip; ++ struct in6_addr mask; ++ uint32_t prefix; ++ uint16_t type; ++ uint16_t flags; ++}; + -+ VXM_HOLD = 0x44, -+ VXM_UNHOLD, ++struct nx_info { ++ struct hlist_node nx_hlist; /* linked list of nxinfos */ ++ vnid_t nx_id; /* vnet id */ ++ atomic_t nx_usecnt; /* usage count */ ++ atomic_t nx_tasks; /* tasks count */ ++ int nx_state; /* context state */ + -+ VXM_MIGRATE = 0x48, -+ VXM_RESCHED, ++ uint64_t nx_flags; /* network flag word */ ++ uint64_t nx_ncaps; /* network capabilities */ + -+ /* all other bits are flags */ -+ VXM_SCHED = 0x80, ++ spinlock_t addr_lock; /* protect address changes */ ++ struct in_addr v4_lback; /* Loopback address */ ++ struct in_addr v4_bcast; /* Broadcast address */ ++ struct nx_addr_v4 v4; /* First/Single ipv4 address */ ++#ifdef CONFIG_IPV6 ++ struct nx_addr_v6 v6; /* First/Single ipv6 address */ ++#endif ++ char nx_name[65]; /* network context name */ +}; + -+struct _vxm_update_1 { -+ uint32_t tokens_max; -+ uint32_t fill_rate; -+ uint32_t interval; -+}; + -+struct _vxm_update_2 { -+ uint32_t tokens_min; -+ uint32_t fill_rate; -+ uint32_t interval; -+}; ++/* status flags */ + -+struct _vxm_rqinfo_1 { -+ uint16_t running; -+ uint16_t onhold; -+ uint16_t iowait; -+ uint16_t uintr; -+ uint32_t idle_tokens; -+}; ++#define NXS_HASHED 0x0001 ++#define NXS_SHUTDOWN 0x0100 ++#define NXS_RELEASED 0x8000 + -+struct _vxm_rqinfo_2 { -+ uint32_t norm_time; -+ uint32_t idle_time; -+ uint32_t idle_skip; -+}; ++extern struct nx_info *lookup_nx_info(int); + -+struct _vxm_sched { -+ uint32_t tokens; -+ uint32_t norm_time; -+ uint32_t idle_time; -+}; ++extern int get_nid_list(int, unsigned int *, int); ++extern int nid_is_hashed(vnid_t); + -+struct _vxm_task { -+ uint16_t pid; -+ uint16_t state; -+}; ++extern int nx_migrate_task(struct task_struct *, struct nx_info *); + -+struct _vxm_event { -+ uint32_t jif; -+ union { -+ uint32_t seq; -+ uint32_t sec; -+ }; -+ union { -+ uint32_t tokens; -+ uint32_t nsec; -+ struct _vxm_task tsk; -+ }; ++extern long vs_net_change(struct nx_info *, unsigned int); ++ ++struct sock; ++ ++ ++#define NX_IPV4(n) ((n)->v4.type != NXA_TYPE_NONE) ++#ifdef CONFIG_IPV6 ++#define NX_IPV6(n) ((n)->v6.type != NXA_TYPE_NONE) ++#else ++#define NX_IPV6(n) (0) ++#endif ++ ++#endif /* _VSERVER_NETWORK_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/network_cmd.h linux-4.9/include/linux/vserver/network_cmd.h +--- linux-4.9/include/linux/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/network_cmd.h 2021-02-24 15:47:45.097743096 +0100 +@@ -0,0 +1,37 @@ ++#ifndef _VSERVER_NETWORK_CMD_H ++#define _VSERVER_NETWORK_CMD_H ++ ++#include ++ ++extern int vc_task_nid(uint32_t); ++ ++extern int vc_nx_info(struct nx_info *, void __user *); ++ ++extern int vc_net_create(uint32_t, void __user *); ++extern int vc_net_migrate(struct nx_info *, void __user *); ++ ++extern int vc_net_add(struct nx_info *, void __user *); ++extern int vc_net_remove(struct nx_info *, void __user *); ++ ++extern int vc_net_add_ipv4_v1(struct nx_info *, void __user *); ++extern int vc_net_add_ipv4(struct nx_info *, void __user *); ++ ++extern int vc_net_rem_ipv4_v1(struct nx_info *, void __user *); ++extern int vc_net_rem_ipv4(struct nx_info *, void __user *); ++ ++extern int vc_net_add_ipv6(struct nx_info *, void __user *); ++extern int vc_net_remove_ipv6(struct nx_info *, void __user *); ++ ++extern int vc_add_match_ipv4(struct nx_info *, void __user *); ++extern int vc_get_match_ipv4(struct nx_info *, void __user *); ++ ++extern int vc_add_match_ipv6(struct nx_info *, void __user *); ++extern int vc_get_match_ipv6(struct nx_info *, void __user *); ++ ++extern int vc_get_nflags(struct nx_info *, void __user *); ++extern int vc_set_nflags(struct nx_info *, void __user *); ++ ++extern int vc_get_ncaps(struct nx_info *, void __user *); ++extern int vc_set_ncaps(struct nx_info *, void __user *); ++ ++#endif /* _VSERVER_CONTEXT_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/percpu.h linux-4.9/include/linux/vserver/percpu.h +--- linux-4.9/include/linux/vserver/percpu.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/percpu.h 2021-02-24 15:47:45.097743096 +0100 +@@ -0,0 +1,14 @@ ++#ifndef _VSERVER_PERCPU_H ++#define _VSERVER_PERCPU_H ++ ++#include "cvirt_def.h" ++#include "sched_def.h" ++ ++struct _vx_percpu { ++ struct _vx_cvirt_pc cvirt; ++ struct _vx_sched_pc sched; ++}; ++ ++#define PERCPU_PERCTX (sizeof(struct _vx_percpu)) ++ ++#endif /* _VSERVER_PERCPU_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/pid.h linux-4.9/include/linux/vserver/pid.h +--- linux-4.9/include/linux/vserver/pid.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/pid.h 2021-02-24 15:47:45.097743096 +0100 +@@ -0,0 +1,51 @@ ++#ifndef _VSERVER_PID_H ++#define _VSERVER_PID_H ++ ++/* pid faking stuff */ ++ ++#define vx_info_map_pid(v, p) \ ++ __vx_info_map_pid((v), (p), __func__, __FILE__, __LINE__) ++#define vx_info_map_tgid(v,p) vx_info_map_pid(v,p) ++#define vx_map_pid(p) vx_info_map_pid(current_vx_info(), p) ++#define vx_map_tgid(p) vx_map_pid(p) ++ ++static inline int __vx_info_map_pid(struct vx_info *vxi, int pid, ++ const char *func, const char *file, int line) ++{ ++ if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) { ++ vxfprintk(VXD_CBIT(cvirt, 2), ++ "vx_map_tgid: %p/%llx: %d -> %d", ++ vxi, (long long)vxi->vx_flags, pid, ++ (pid && pid == vxi->vx_initpid) ? 1 : pid, ++ func, file, line); ++ if (pid == 0) ++ return 0; ++ if (pid == vxi->vx_initpid) ++ return 1; ++ } ++ return pid; ++} ++ ++#define vx_info_rmap_pid(v, p) \ ++ __vx_info_rmap_pid((v), (p), __func__, __FILE__, __LINE__) ++#define vx_rmap_pid(p) vx_info_rmap_pid(current_vx_info(), p) ++#define vx_rmap_tgid(p) vx_rmap_pid(p) ++ ++static inline int __vx_info_rmap_pid(struct vx_info *vxi, int pid, ++ const char *func, const char *file, int line) ++{ ++ if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) { ++ vxfprintk(VXD_CBIT(cvirt, 2), ++ "vx_rmap_tgid: %p/%llx: %d -> %d", ++ vxi, (long long)vxi->vx_flags, pid, ++ (pid == 1) ? vxi->vx_initpid : pid, ++ func, file, line); ++ if ((pid == 1) && vxi->vx_initpid) ++ return vxi->vx_initpid; ++ if (pid == vxi->vx_initpid) ++ return ~0U; ++ } ++ return pid; ++} ++ ++#endif +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/sched.h linux-4.9/include/linux/vserver/sched.h +--- linux-4.9/include/linux/vserver/sched.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/sched.h 2021-02-24 15:47:45.097743096 +0100 +@@ -0,0 +1,23 @@ ++#ifndef _VSERVER_SCHED_H ++#define _VSERVER_SCHED_H ++ ++ ++#ifdef __KERNEL__ ++ ++struct timespec; ++ ++void vx_vsi_uptime(struct timespec *, struct timespec *); ++ ++ ++struct vx_info; ++ ++void vx_update_load(struct vx_info *); ++ ++ ++void vx_update_sched_param(struct _vx_sched *sched, ++ struct _vx_sched_pc *sched_pc); ++ ++#endif /* __KERNEL__ */ ++#else /* _VSERVER_SCHED_H */ ++#warning duplicate inclusion ++#endif /* _VSERVER_SCHED_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/sched_cmd.h linux-4.9/include/linux/vserver/sched_cmd.h +--- linux-4.9/include/linux/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/sched_cmd.h 2021-02-24 15:47:45.097743096 +0100 +@@ -0,0 +1,11 @@ ++#ifndef _VSERVER_SCHED_CMD_H ++#define _VSERVER_SCHED_CMD_H ++ ++ ++#include ++#include ++ ++extern int vc_set_prio_bias(struct vx_info *, void __user *); ++extern int vc_get_prio_bias(struct vx_info *, void __user *); ++ ++#endif /* _VSERVER_SCHED_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/sched_def.h linux-4.9/include/linux/vserver/sched_def.h +--- linux-4.9/include/linux/vserver/sched_def.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/sched_def.h 2021-02-24 15:47:45.097743096 +0100 +@@ -0,0 +1,38 @@ ++#ifndef _VSERVER_SCHED_DEF_H ++#define _VSERVER_SCHED_DEF_H ++ ++#include ++#include ++#include ++#include ++#include ++ ++ ++/* context sub struct */ ++ ++struct _vx_sched { ++ int prio_bias; /* bias offset for priority */ ++ ++ cpumask_t update; /* CPUs which should update */ ++}; ++ ++struct _vx_sched_pc { ++ int prio_bias; /* bias offset for priority */ ++ ++ uint64_t user_ticks; /* token tick events */ ++ uint64_t sys_ticks; /* token tick events */ ++ uint64_t hold_ticks; /* token ticks paused */ ++}; ++ ++ ++#ifdef CONFIG_VSERVER_DEBUG ++ ++static inline void __dump_vx_sched(struct _vx_sched *sched) ++{ ++ printk("\t_vx_sched:\n"); ++ printk("\t priority = %4d\n", sched->prio_bias); ++} ++ ++#endif ++ ++#endif /* _VSERVER_SCHED_DEF_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/signal.h linux-4.9/include/linux/vserver/signal.h +--- linux-4.9/include/linux/vserver/signal.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/signal.h 2021-02-24 15:47:45.097743096 +0100 +@@ -0,0 +1,14 @@ ++#ifndef _VSERVER_SIGNAL_H ++#define _VSERVER_SIGNAL_H ++ ++ ++#ifdef __KERNEL__ ++ ++struct vx_info; ++ ++int vx_info_kill(struct vx_info *, int, int); ++ ++#endif /* __KERNEL__ */ ++#else /* _VSERVER_SIGNAL_H */ ++#warning duplicate inclusion ++#endif /* _VSERVER_SIGNAL_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/signal_cmd.h linux-4.9/include/linux/vserver/signal_cmd.h +--- linux-4.9/include/linux/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/signal_cmd.h 2021-02-24 15:47:45.097743096 +0100 +@@ -0,0 +1,14 @@ ++#ifndef _VSERVER_SIGNAL_CMD_H ++#define _VSERVER_SIGNAL_CMD_H ++ ++#include ++ ++ ++extern int vc_ctx_kill(struct vx_info *, void __user *); ++extern int vc_wait_exit(struct vx_info *, void __user *); ++ ++ ++extern int vc_get_pflags(uint32_t pid, void __user *); ++extern int vc_set_pflags(uint32_t pid, void __user *); ++ ++#endif /* _VSERVER_SIGNAL_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/space.h linux-4.9/include/linux/vserver/space.h +--- linux-4.9/include/linux/vserver/space.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/space.h 2021-02-24 15:47:45.097743096 +0100 +@@ -0,0 +1,12 @@ ++#ifndef _VSERVER_SPACE_H ++#define _VSERVER_SPACE_H ++ ++#include ++ ++struct vx_info; ++ ++int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index); ++ ++#else /* _VSERVER_SPACE_H */ ++#warning duplicate inclusion ++#endif /* _VSERVER_SPACE_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/space_cmd.h linux-4.9/include/linux/vserver/space_cmd.h +--- linux-4.9/include/linux/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/space_cmd.h 2021-02-24 15:47:45.097743096 +0100 +@@ -0,0 +1,13 @@ ++#ifndef _VSERVER_SPACE_CMD_H ++#define _VSERVER_SPACE_CMD_H ++ ++#include ++ ++ ++extern int vc_enter_space_v1(struct vx_info *, void __user *); ++extern int vc_set_space_v1(struct vx_info *, void __user *); ++extern int vc_enter_space(struct vx_info *, void __user *); ++extern int vc_set_space(struct vx_info *, void __user *); ++extern int vc_get_space_mask(void __user *, int); ++ ++#endif /* _VSERVER_SPACE_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/switch.h linux-4.9/include/linux/vserver/switch.h +--- linux-4.9/include/linux/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/switch.h 2021-02-24 15:47:45.097743096 +0100 +@@ -0,0 +1,8 @@ ++#ifndef _VSERVER_SWITCH_H ++#define _VSERVER_SWITCH_H ++ ++ ++#include ++#include ++ ++#endif /* _VSERVER_SWITCH_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/tag.h linux-4.9/include/linux/vserver/tag.h +--- linux-4.9/include/linux/vserver/tag.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/tag.h 2021-02-24 15:47:45.097743096 +0100 +@@ -0,0 +1,160 @@ ++#ifndef _DX_TAG_H ++#define _DX_TAG_H ++ ++#include ++#include ++ ++ ++#define DX_TAG(in) (IS_TAGGED(in)) ++ ++ ++#ifdef CONFIG_TAG_NFSD ++#define DX_TAG_NFSD 1 ++#else ++#define DX_TAG_NFSD 0 ++#endif ++ ++ ++#ifdef CONFIG_TAGGING_NONE ++ ++#define MAX_UID 0xFFFFFFFF ++#define MAX_GID 0xFFFFFFFF ++ ++#define INOTAG_TAG(cond, uid, gid, tag) (0) ++ ++#define TAGINO_UID(cond, uid, tag) (uid) ++#define TAGINO_GID(cond, gid, tag) (gid) ++ ++#endif ++ ++ ++#ifdef CONFIG_TAGGING_GID16 ++ ++#define MAX_UID 0xFFFFFFFF ++#define MAX_GID 0x0000FFFF ++ ++#define INOTAG_TAG(cond, uid, gid, tag) \ ++ ((cond) ? (((gid) >> 16) & 0xFFFF) : 0) ++ ++#define TAGINO_UID(cond, uid, tag) (uid) ++#define TAGINO_GID(cond, gid, tag) \ ++ ((cond) ? (((gid) & 0xFFFF) | ((tag) << 16)) : (gid)) ++ ++#endif ++ ++ ++#ifdef CONFIG_TAGGING_ID24 ++ ++#define MAX_UID 0x00FFFFFF ++#define MAX_GID 0x00FFFFFF ++ ++#define INOTAG_TAG(cond, uid, gid, tag) \ ++ ((cond) ? ((((uid) >> 16) & 0xFF00) | (((gid) >> 24) & 0xFF)) : 0) ++ ++#define TAGINO_UID(cond, uid, tag) \ ++ ((cond) ? (((uid) & 0xFFFFFF) | (((tag) & 0xFF00) << 16)) : (uid)) ++#define TAGINO_GID(cond, gid, tag) \ ++ ((cond) ? (((gid) & 0xFFFFFF) | (((tag) & 0x00FF) << 24)) : (gid)) ++ ++#endif ++ ++ ++#ifdef CONFIG_TAGGING_UID16 ++ ++#define MAX_UID 0x0000FFFF ++#define MAX_GID 0xFFFFFFFF ++ ++#define INOTAG_TAG(cond, uid, gid, tag) \ ++ ((cond) ? (((uid) >> 16) & 0xFFFF) : 0) ++ ++#define TAGINO_UID(cond, uid, tag) \ ++ ((cond) ? (((uid) & 0xFFFF) | ((tag) << 16)) : (uid)) ++#define TAGINO_GID(cond, gid, tag) (gid) ++ ++#endif ++ ++ ++#ifdef CONFIG_TAGGING_INTERN ++ ++#define MAX_UID 0xFFFFFFFF ++#define MAX_GID 0xFFFFFFFF ++ ++#define INOTAG_TAG(cond, uid, gid, tag) \ ++ ((cond) ? (tag) : 0) ++ ++#define TAGINO_UID(cond, uid, tag) (uid) ++#define TAGINO_GID(cond, gid, tag) (gid) ++ ++#endif ++ ++ ++#ifndef CONFIG_TAGGING_NONE ++#define dx_current_fstag(sb) \ ++ ((sb)->s_flags & MS_TAGGED ? dx_current_tag() : 0) ++#else ++#define dx_current_fstag(sb) (0) ++#endif ++ ++#ifndef CONFIG_TAGGING_INTERN ++#define TAGINO_TAG(cond, tag) (0) ++#else ++#define TAGINO_TAG(cond, tag) ((cond) ? (tag) : 0) ++#endif ++ ++#define TAGINO_KUID(cond, kuid, ktag) \ ++ KUIDT_INIT(TAGINO_UID(cond, __kuid_val(kuid), __ktag_val(ktag))) ++#define TAGINO_KGID(cond, kgid, ktag) \ ++ KGIDT_INIT(TAGINO_GID(cond, __kgid_val(kgid), __ktag_val(ktag))) ++#define TAGINO_KTAG(cond, ktag) \ ++ KTAGT_INIT(TAGINO_TAG(cond, __ktag_val(ktag))) ++ ++ ++#define INOTAG_UID(cond, uid, gid) \ ++ ((cond) ? ((uid) & MAX_UID) : (uid)) ++#define INOTAG_GID(cond, uid, gid) \ ++ ((cond) ? ((gid) & MAX_GID) : (gid)) ++ ++#define INOTAG_KUID(cond, kuid, kgid) \ ++ KUIDT_INIT(INOTAG_UID(cond, __kuid_val(kuid), __kgid_val(kgid))) ++#define INOTAG_KGID(cond, kuid, kgid) \ ++ KGIDT_INIT(INOTAG_GID(cond, __kuid_val(kuid), __kgid_val(kgid))) ++#define INOTAG_KTAG(cond, kuid, kgid, ktag) \ ++ KTAGT_INIT(INOTAG_TAG(cond, \ ++ __kuid_val(kuid), __kgid_val(kgid), __ktag_val(ktag))) ++ ++ ++static inline uid_t dx_map_uid(uid_t uid) ++{ ++ if ((uid > MAX_UID) && (uid != -1)) ++ uid = -2; ++ return (uid & MAX_UID); ++} ++ ++static inline gid_t dx_map_gid(gid_t gid) ++{ ++ if ((gid > MAX_GID) && (gid != -1)) ++ gid = -2; ++ return (gid & MAX_GID); ++} ++ ++struct peer_tag { ++ int32_t xid; ++ int32_t nid; ++}; ++ ++#define dx_notagcheck(sb) ((sb) && ((sb)->s_flags & MS_NOTAGCHECK)) ++ ++int dx_parse_tag(char *string, vtag_t *tag, int remove, int *mnt_flags, ++ unsigned long *flags); ++ ++#ifdef CONFIG_PROPAGATE ++ ++void __dx_propagate_tag(struct nameidata *nd, struct inode *inode); ++ ++#define dx_propagate_tag(n, i) __dx_propagate_tag(n, i) ++ ++#else ++#define dx_propagate_tag(n, i) do { } while (0) ++#endif ++ ++#endif /* _DX_TAG_H */ +diff -urNp -x '*.orig' linux-4.9/include/linux/vserver/tag_cmd.h linux-4.9/include/linux/vserver/tag_cmd.h +--- linux-4.9/include/linux/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/linux/vserver/tag_cmd.h 2021-02-24 15:47:45.097743096 +0100 +@@ -0,0 +1,10 @@ ++#ifndef _VSERVER_TAG_CMD_H ++#define _VSERVER_TAG_CMD_H ++ ++#include ++ ++extern int vc_task_tag(uint32_t); ++ ++extern int vc_tag_migrate(uint32_t); ++ ++#endif /* _VSERVER_TAG_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/net/addrconf.h linux-4.9/include/net/addrconf.h +--- linux-4.9/include/net/addrconf.h 2021-02-24 15:47:32.424013281 +0100 ++++ linux-4.9/include/net/addrconf.h 2021-02-24 15:47:45.101076533 +0100 +@@ -85,7 +85,7 @@ struct inet6_ifaddr *ipv6_get_ifaddr(str + + int ipv6_dev_get_saddr(struct net *net, const struct net_device *dev, + const struct in6_addr *daddr, unsigned int srcprefs, +- struct in6_addr *saddr); ++ struct in6_addr *saddr, struct nx_info *nxi); + int __ipv6_get_lladdr(struct inet6_dev *idev, struct in6_addr *addr, + u32 banned_flags); + int ipv6_get_lladdr(struct net_device *dev, struct in6_addr *addr, +diff -urNp -x '*.orig' linux-4.9/include/net/af_unix.h linux-4.9/include/net/af_unix.h +--- linux-4.9/include/net/af_unix.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/include/net/af_unix.h 2021-02-24 15:47:45.101076533 +0100 +@@ -4,6 +4,7 @@ + #include + #include + #include ++// #include + #include + + void unix_inflight(struct user_struct *user, struct file *fp); +diff -urNp -x '*.orig' linux-4.9/include/net/inet_timewait_sock.h linux-4.9/include/net/inet_timewait_sock.h +--- linux-4.9/include/net/inet_timewait_sock.h 2021-02-24 15:47:32.427346719 +0100 ++++ linux-4.9/include/net/inet_timewait_sock.h 2021-02-24 15:47:45.101076533 +0100 +@@ -72,6 +72,10 @@ struct inet_timewait_sock { + #define tw_num __tw_common.skc_num + #define tw_cookie __tw_common.skc_cookie + #define tw_dr __tw_common.skc_tw_dr ++#define tw_xid __tw_common.skc_xid ++#define tw_vx_info __tw_common.skc_vx_info ++#define tw_nid __tw_common.skc_nid ++#define tw_nx_info __tw_common.skc_nx_info + + int tw_timeout; + volatile unsigned char tw_substate; +diff -urNp -x '*.orig' linux-4.9/include/net/ip6_route.h linux-4.9/include/net/ip6_route.h +--- linux-4.9/include/net/ip6_route.h 2021-02-24 15:47:32.427346719 +0100 ++++ linux-4.9/include/net/ip6_route.h 2021-02-24 15:47:45.101076533 +0100 +@@ -26,6 +26,7 @@ struct route_info { + #include + #include + #include ++#include + + #define RT6_LOOKUP_F_IFACE 0x00000001 + #define RT6_LOOKUP_F_REACHABLE 0x00000002 +@@ -98,17 +99,19 @@ int ip6_del_rt(struct rt6_info *); + static inline int ip6_route_get_saddr(struct net *net, struct rt6_info *rt, + const struct in6_addr *daddr, + unsigned int prefs, +- struct in6_addr *saddr) ++ struct in6_addr *saddr, ++ struct nx_info *nxi) + { + struct inet6_dev *idev = + rt ? ip6_dst_idev((struct dst_entry *)rt) : NULL; + int err = 0; + +- if (rt && rt->rt6i_prefsrc.plen) ++ if (rt && rt->rt6i_prefsrc.plen && (!nxi || ++ v6_addr_in_nx_info(nxi, &rt->rt6i_prefsrc.addr, NXA_TYPE_ADDR))) + *saddr = rt->rt6i_prefsrc.addr; + else + err = ipv6_dev_get_saddr(net, idev ? idev->dev : NULL, +- daddr, prefs, saddr); ++ daddr, prefs, saddr, nxi); + + return err; + } +diff -urNp -x '*.orig' linux-4.9/include/net/route.h linux-4.9/include/net/route.h +--- linux-4.9/include/net/route.h 2021-02-24 15:47:32.434013594 +0100 ++++ linux-4.9/include/net/route.h 2021-02-24 15:47:45.101076533 +0100 +@@ -226,6 +226,9 @@ static inline void ip_rt_put(struct rtab + dst_release(&rt->dst); + } + ++#include ++#include ++ + #define IPTOS_RT_MASK (IPTOS_TOS_MASK & ~3) + + extern const __u8 ip_tos2prio[16]; +@@ -273,6 +276,9 @@ static inline void ip_route_connect_init + protocol, flow_flags, dst, src, dport, sport); + } + ++extern struct rtable *ip_v4_find_src(struct net *net, struct nx_info *, ++ struct flowi4 *); ++ + static inline struct rtable *ip_route_connect(struct flowi4 *fl4, + __be32 dst, __be32 src, u32 tos, + int oif, u8 protocol, +@@ -281,11 +287,25 @@ static inline struct rtable *ip_route_co + { + struct net *net = sock_net(sk); + struct rtable *rt; ++ struct nx_info *nx_info = current_nx_info(); + + ip_route_connect_init(fl4, dst, src, tos, oif, protocol, + sport, dport, sk); + +- if (!dst || !src) { ++ if (sk) ++ nx_info = sk->sk_nx_info; ++ ++ vxdprintk(VXD_CBIT(net, 4), ++ "ip_route_connect(%p) %p,%p;%lx", ++ sk, nx_info, sk->sk_socket, ++ (sk->sk_socket?sk->sk_socket->flags:0)); ++ ++ rt = ip_v4_find_src(net, nx_info, fl4); ++ if (IS_ERR(rt)) ++ return rt; ++ ip_rt_put(rt); ++ ++ if (!fl4->daddr || !fl4->saddr) { + rt = __ip_route_output_key(net, fl4); + if (IS_ERR(rt)) + return rt; +diff -urNp -x '*.orig' linux-4.9/include/net/sock.h linux-4.9/include/net/sock.h +--- linux-4.9/include/net/sock.h 2021-02-24 15:47:32.434013594 +0100 ++++ linux-4.9/include/net/sock.h 2021-02-24 15:47:45.101076533 +0100 +@@ -187,6 +187,10 @@ struct sock_common { + struct in6_addr skc_v6_daddr; + struct in6_addr skc_v6_rcv_saddr; + #endif ++ vxid_t skc_xid; ++ struct vx_info *skc_vx_info; ++ vnid_t skc_nid; ++ struct nx_info *skc_nx_info; + + atomic64_t skc_cookie; + +@@ -337,8 +341,12 @@ struct sock { + #define sk_prot __sk_common.skc_prot + #define sk_net __sk_common.skc_net + #define sk_v6_daddr __sk_common.skc_v6_daddr +-#define sk_v6_rcv_saddr __sk_common.skc_v6_rcv_saddr ++#define sk_v6_rcv_saddr __sk_common.skc_v6_rcv_saddr + #define sk_cookie __sk_common.skc_cookie ++#define sk_xid __sk_common.skc_xid ++#define sk_vx_info __sk_common.skc_vx_info ++#define sk_nid __sk_common.skc_nid ++#define sk_nx_info __sk_common.skc_nx_info + #define sk_incoming_cpu __sk_common.skc_incoming_cpu + #define sk_flags __sk_common.skc_flags + #define sk_rxhash __sk_common.skc_rxhash +diff -urNp -x '*.orig' linux-4.9/include/uapi/Kbuild linux-4.9/include/uapi/Kbuild +--- linux-4.9/include/uapi/Kbuild 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/include/uapi/Kbuild 2021-02-24 15:47:45.101076533 +0100 +@@ -13,3 +13,4 @@ header-y += drm/ + header-y += xen/ + header-y += scsi/ + header-y += misc/ ++header-y += vserver/ +diff -urNp -x '*.orig' linux-4.9/include/uapi/linux/btrfs_tree.h linux-4.9/include/uapi/linux/btrfs_tree.h +--- linux-4.9/include/uapi/linux/btrfs_tree.h 2021-02-24 15:47:32.444013907 +0100 ++++ linux-4.9/include/uapi/linux/btrfs_tree.h 2021-02-24 15:47:45.101076533 +0100 +@@ -566,11 +566,14 @@ struct btrfs_inode_item { + /* modification sequence number for NFS */ + __le64 sequence; + ++ __le16 tag; + /* + * a little future expansion, for more than this we can + * just grow the inode item and version it + */ +- __le64 reserved[4]; ++ __le16 reserved16; ++ __le32 reserved32; ++ __le64 reserved[3]; + struct btrfs_timespec atime; + struct btrfs_timespec ctime; + struct btrfs_timespec mtime; +diff -urNp -x '*.orig' linux-4.9/include/uapi/linux/capability.h linux-4.9/include/uapi/linux/capability.h +--- linux-4.9/include/uapi/linux/capability.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/include/uapi/linux/capability.h 2021-02-24 15:47:45.101076533 +0100 +@@ -257,6 +257,7 @@ struct vfs_cap_data { + arbitrary SCSI commands */ + /* Allow setting encryption key on loopback filesystem */ + /* Allow setting zone reclaim policy */ ++/* Allow the selection of a security context */ + + #define CAP_SYS_ADMIN 21 + +@@ -352,7 +353,12 @@ struct vfs_cap_data { + + #define CAP_LAST_CAP CAP_AUDIT_READ + +-#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP) ++/* Allow context manipulations */ ++/* Allow changing context info on files */ ++ ++#define CAP_CONTEXT 63 ++ ++#define cap_valid(x) ((x) >= 0 && ((x) <= CAP_LAST_CAP || (x) == CAP_CONTEXT)) + + /* + * Bit location of each capability (used by user-space library and kernel) +diff -urNp -x '*.orig' linux-4.9/include/uapi/linux/fs.h linux-4.9/include/uapi/linux/fs.h +--- linux-4.9/include/uapi/linux/fs.h 2021-02-24 15:47:32.444013907 +0100 ++++ linux-4.9/include/uapi/linux/fs.h 2021-02-24 15:47:45.101076533 +0100 +@@ -130,6 +130,9 @@ struct inodes_stat_t { + #define MS_I_VERSION (1<<23) /* Update inode I_version field */ + #define MS_STRICTATIME (1<<24) /* Always perform atime updates */ + #define MS_LAZYTIME (1<<25) /* Update the on-disk [acm]times lazily */ ++#define MS_TAGGED (1<<8) /* use generic inode tagging */ ++#define MS_NOTAGCHECK (1<<9) /* don't check tags */ ++#define MS_TAGID (1<<26) /* use specific tag for this mount */ + + /* These sb flags are internal to the kernel */ + #define MS_SUBMOUNT (1<<26) +@@ -313,13 +316,16 @@ struct fscrypt_policy { + #define FS_EA_INODE_FL 0x00200000 /* Inode used for large EA */ + #define FS_EOFBLOCKS_FL 0x00400000 /* Reserved for ext4 */ + #define FS_NOCOW_FL 0x00800000 /* Do not cow file */ ++#define FS_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */ + #define FS_INLINE_DATA_FL 0x10000000 /* Reserved for ext4 */ + #define FS_PROJINHERIT_FL 0x20000000 /* Create with parents projid */ + #define FS_RESERVED_FL 0x80000000 /* reserved for ext2 lib */ + +-#define FS_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */ +-#define FS_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */ ++#define FS_BARRIER_FL 0x04000000 /* Barrier for chroot() */ ++#define FS_COW_FL 0x20000000 /* Copy on Write marker */ + ++#define FS_FL_USER_VISIBLE 0x0103DFFF /* User visible flags */ ++#define FS_FL_USER_MODIFIABLE 0x010380FF /* User modifiable flags */ + + #define SYNC_FILE_RANGE_WAIT_BEFORE 1 + #define SYNC_FILE_RANGE_WRITE 2 +diff -urNp -x '*.orig' linux-4.9/include/uapi/linux/gfs2_ondisk.h linux-4.9/include/uapi/linux/gfs2_ondisk.h +--- linux-4.9/include/uapi/linux/gfs2_ondisk.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/include/uapi/linux/gfs2_ondisk.h 2021-02-24 15:47:45.104409971 +0100 +@@ -225,6 +225,9 @@ enum { + gfs2fl_Sync = 8, + gfs2fl_System = 9, + gfs2fl_TopLevel = 10, ++ gfs2fl_IXUnlink = 16, ++ gfs2fl_Barrier = 17, ++ gfs2fl_Cow = 18, + gfs2fl_TruncInProg = 29, + gfs2fl_InheritDirectio = 30, + gfs2fl_InheritJdata = 31, +@@ -242,6 +245,9 @@ enum { + #define GFS2_DIF_SYNC 0x00000100 + #define GFS2_DIF_SYSTEM 0x00000200 /* New in gfs2 */ + #define GFS2_DIF_TOPDIR 0x00000400 /* New in gfs2 */ ++#define GFS2_DIF_IXUNLINK 0x00010000 ++#define GFS2_DIF_BARRIER 0x00020000 ++#define GFS2_DIF_COW 0x00040000 + #define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */ + #define GFS2_DIF_INHERIT_DIRECTIO 0x40000000 /* only in gfs1 */ + #define GFS2_DIF_INHERIT_JDATA 0x80000000 +diff -urNp -x '*.orig' linux-4.9/include/uapi/linux/if_tun.h linux-4.9/include/uapi/linux/if_tun.h +--- linux-4.9/include/uapi/linux/if_tun.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/include/uapi/linux/if_tun.h 2021-02-24 15:47:45.104409971 +0100 +@@ -56,6 +56,7 @@ + */ + #define TUNSETVNETBE _IOW('T', 222, int) + #define TUNGETVNETBE _IOR('T', 223, int) ++#define TUNSETNID _IOW('T', 224, int) + + /* TUNSETIFF ifr flags */ + #define IFF_TUN 0x0001 +diff -urNp -x '*.orig' linux-4.9/include/uapi/linux/major.h linux-4.9/include/uapi/linux/major.h +--- linux-4.9/include/uapi/linux/major.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/include/uapi/linux/major.h 2021-02-24 15:47:45.104409971 +0100 +@@ -15,6 +15,7 @@ + #define HD_MAJOR IDE0_MAJOR + #define PTY_SLAVE_MAJOR 3 + #define TTY_MAJOR 4 ++#define VROOT_MAJOR 4 + #define TTYAUX_MAJOR 5 + #define LP_MAJOR 6 + #define VCS_MAJOR 7 +diff -urNp -x '*.orig' linux-4.9/include/uapi/linux/nfs_mount.h linux-4.9/include/uapi/linux/nfs_mount.h +--- linux-4.9/include/uapi/linux/nfs_mount.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/include/uapi/linux/nfs_mount.h 2021-02-24 15:47:45.104409971 +0100 +@@ -63,7 +63,8 @@ struct nfs_mount_data { + #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 non-text parsed mount data only */ + #define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */ + #define NFS_MOUNT_UNSHARED 0x8000 /* 5 */ +-#define NFS_MOUNT_FLAGMASK 0xFFFF ++#define NFS_MOUNT_TAGGED 0x10000 /* context tagging */ ++#define NFS_MOUNT_FLAGMASK 0x1FFFF + + /* The following are for internal use only */ + #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000 +diff -urNp -x '*.orig' linux-4.9/include/uapi/linux/reboot.h linux-4.9/include/uapi/linux/reboot.h +--- linux-4.9/include/uapi/linux/reboot.h 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/include/uapi/linux/reboot.h 2021-02-24 15:47:45.104409971 +0100 +@@ -33,7 +33,7 @@ + #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4 + #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2 + #define LINUX_REBOOT_CMD_KEXEC 0x45584543 +- ++#define LINUX_REBOOT_CMD_OOM 0xDEADBEEF + + + #endif /* _UAPI_LINUX_REBOOT_H */ +diff -urNp -x '*.orig' linux-4.9/include/uapi/linux/sysctl.h linux-4.9/include/uapi/linux/sysctl.h +--- linux-4.9/include/uapi/linux/sysctl.h 2021-02-24 15:47:32.450680782 +0100 ++++ linux-4.9/include/uapi/linux/sysctl.h 2021-02-24 15:47:45.104409971 +0100 +@@ -58,6 +58,7 @@ enum + CTL_ABI=9, /* Binary emulation */ + CTL_CPU=10, /* CPU stuff (speed scaling, etc) */ + CTL_ARLAN=254, /* arlan wireless driver */ ++ CTL_VSERVER=4242, /* Linux-VServer debug */ + CTL_S390DBF=5677, /* s390 debug */ + CTL_SUNRPC=7249, /* sunrpc debug */ + CTL_PM=9899, /* frv power management */ +@@ -92,6 +93,7 @@ enum + + KERN_PANIC=15, /* int: panic timeout */ + KERN_REALROOTDEV=16, /* real root device to mount after initrd */ ++ KERN_VSHELPER=17, /* string: path to vshelper policy agent */ + + KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ + KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */ +diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/Kbuild linux-4.9/include/uapi/vserver/Kbuild +--- linux-4.9/include/uapi/vserver/Kbuild 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/uapi/vserver/Kbuild 2021-02-24 15:47:45.104409971 +0100 +@@ -0,0 +1,9 @@ ++ ++header-y += context_cmd.h network_cmd.h space_cmd.h \ ++ cacct_cmd.h cvirt_cmd.h limit_cmd.h dlimit_cmd.h \ ++ inode_cmd.h tag_cmd.h sched_cmd.h signal_cmd.h \ ++ debug_cmd.h device_cmd.h ++ ++header-y += switch.h context.h network.h monitor.h \ ++ limit.h inode.h device.h ++ +diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/cacct_cmd.h linux-4.9/include/uapi/vserver/cacct_cmd.h +--- linux-4.9/include/uapi/vserver/cacct_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/uapi/vserver/cacct_cmd.h 2021-02-24 15:47:45.104409971 +0100 +@@ -0,0 +1,15 @@ ++#ifndef _UAPI_VS_CACCT_CMD_H ++#define _UAPI_VS_CACCT_CMD_H ++ ++ ++/* virtual host info name commands */ ++ ++#define VCMD_sock_stat VC_CMD(VSTAT, 5, 0) ++ ++struct vcmd_sock_stat_v0 { ++ uint32_t field; ++ uint32_t count[3]; ++ uint64_t total[3]; ++}; ++ ++#endif /* _UAPI_VS_CACCT_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/context.h linux-4.9/include/uapi/vserver/context.h +--- linux-4.9/include/uapi/vserver/context.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/uapi/vserver/context.h 2021-02-24 15:47:45.104409971 +0100 +@@ -0,0 +1,81 @@ ++#ifndef _UAPI_VS_CONTEXT_H ++#define _UAPI_VS_CONTEXT_H ++ ++#include ++#include ++ ++ ++/* context flags */ ++ ++#define VXF_INFO_SCHED 0x00000002 ++#define VXF_INFO_NPROC 0x00000004 ++#define VXF_INFO_PRIVATE 0x00000008 ++ ++#define VXF_INFO_INIT 0x00000010 ++#define VXF_INFO_HIDE 0x00000020 ++#define VXF_INFO_ULIMIT 0x00000040 ++#define VXF_INFO_NSPACE 0x00000080 ++ ++#define VXF_SCHED_HARD 0x00000100 ++#define VXF_SCHED_PRIO 0x00000200 ++#define VXF_SCHED_PAUSE 0x00000400 ++ ++#define VXF_VIRT_MEM 0x00010000 ++#define VXF_VIRT_UPTIME 0x00020000 ++#define VXF_VIRT_CPU 0x00040000 ++#define VXF_VIRT_LOAD 0x00080000 ++#define VXF_VIRT_TIME 0x00100000 ++ ++#define VXF_HIDE_MOUNT 0x01000000 ++/* was VXF_HIDE_NETIF 0x02000000 */ ++#define VXF_HIDE_VINFO 0x04000000 ++ ++#define VXF_STATE_SETUP (1ULL << 32) ++#define VXF_STATE_INIT (1ULL << 33) ++#define VXF_STATE_ADMIN (1ULL << 34) ++ ++#define VXF_SC_HELPER (1ULL << 36) ++#define VXF_REBOOT_KILL (1ULL << 37) ++#define VXF_PERSISTENT (1ULL << 38) ++ ++#define VXF_FORK_RSS (1ULL << 48) ++#define VXF_PROLIFIC (1ULL << 49) ++ ++#define VXF_IGNEG_NICE (1ULL << 52) ++ ++#define VXF_ONE_TIME (0x0007ULL << 32) ++ ++#define VXF_INIT_SET (VXF_STATE_SETUP | VXF_STATE_INIT | VXF_STATE_ADMIN) ++ ++ ++/* context migration */ ++ ++#define VXM_SET_INIT 0x00000001 ++#define VXM_SET_REAPER 0x00000002 ++ ++/* context caps */ ++ ++#define VXC_SET_UTSNAME 0x00000001 ++#define VXC_SET_RLIMIT 0x00000002 ++#define VXC_FS_SECURITY 0x00000004 ++#define VXC_FS_TRUSTED 0x00000008 ++#define VXC_TIOCSTI 0x00000010 ++ ++/* was VXC_RAW_ICMP 0x00000100 */ ++#define VXC_SYSLOG 0x00001000 ++#define VXC_OOM_ADJUST 0x00002000 ++#define VXC_AUDIT_CONTROL 0x00004000 ++ ++#define VXC_SECURE_MOUNT 0x00010000 ++/* #define VXC_SECURE_REMOUNT 0x00020000 */ ++#define VXC_BINARY_MOUNT 0x00040000 ++#define VXC_DEV_MOUNT 0x00080000 ++ ++#define VXC_QUOTA_CTL 0x00100000 ++#define VXC_ADMIN_MAPPER 0x00200000 ++#define VXC_ADMIN_CLOOP 0x00400000 ++ ++#define VXC_KTHREAD 0x01000000 ++#define VXC_NAMESPACE 0x02000000 ++ ++#endif /* _UAPI_VS_CONTEXT_H */ +diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/context_cmd.h linux-4.9/include/uapi/vserver/context_cmd.h +--- linux-4.9/include/uapi/vserver/context_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/uapi/vserver/context_cmd.h 2021-02-24 15:47:45.104409971 +0100 +@@ -0,0 +1,115 @@ ++#ifndef _UAPI_VS_CONTEXT_CMD_H ++#define _UAPI_VS_CONTEXT_CMD_H ++ ++ ++/* vinfo commands */ ++ ++#define VCMD_task_xid VC_CMD(VINFO, 1, 0) ++ ++ ++#define VCMD_vx_info VC_CMD(VINFO, 5, 0) ++ ++struct vcmd_vx_info_v0 { ++ uint32_t xid; ++ uint32_t initpid; ++ /* more to come */ ++}; ++ ++ ++#define VCMD_ctx_stat VC_CMD(VSTAT, 0, 0) ++ ++struct vcmd_ctx_stat_v0 { ++ uint32_t usecnt; ++ uint32_t tasks; ++ /* more to come */ ++}; ++ ++ ++/* context commands */ ++ ++#define VCMD_ctx_create_v0 VC_CMD(VPROC, 1, 0) ++#define VCMD_ctx_create VC_CMD(VPROC, 1, 1) ++ ++struct vcmd_ctx_create { ++ uint64_t flagword; ++}; ++ ++#define VCMD_ctx_migrate_v0 VC_CMD(PROCMIG, 1, 0) ++#define VCMD_ctx_migrate VC_CMD(PROCMIG, 1, 1) ++ ++struct vcmd_ctx_migrate { ++ uint64_t flagword; ++}; ++ ++ ++ ++/* flag commands */ ++ ++#define VCMD_get_cflags VC_CMD(FLAGS, 1, 0) ++#define VCMD_set_cflags VC_CMD(FLAGS, 2, 0) ++ ++struct vcmd_ctx_flags_v0 { ++ uint64_t flagword; ++ uint64_t mask; ++}; ++ ++ ++ ++/* context caps commands */ ++ ++#define VCMD_get_ccaps VC_CMD(FLAGS, 3, 1) ++#define VCMD_set_ccaps VC_CMD(FLAGS, 4, 1) ++ ++struct vcmd_ctx_caps_v1 { ++ uint64_t ccaps; ++ uint64_t cmask; ++}; ++ ++ ++ ++/* bcaps commands */ ++ ++#define VCMD_get_bcaps VC_CMD(FLAGS, 9, 0) ++#define VCMD_set_bcaps VC_CMD(FLAGS, 10, 0) ++ ++struct vcmd_bcaps { ++ uint64_t bcaps; ++ uint64_t bmask; ++}; ++ ++ ++ ++/* umask commands */ ++ ++#define VCMD_get_umask VC_CMD(FLAGS, 13, 0) ++#define VCMD_set_umask VC_CMD(FLAGS, 14, 0) ++ ++struct vcmd_umask { ++ uint64_t umask; ++ uint64_t mask; ++}; ++ ++ ++ ++/* wmask commands */ ++ ++#define VCMD_get_wmask VC_CMD(FLAGS, 15, 0) ++#define VCMD_set_wmask VC_CMD(FLAGS, 16, 0) ++ ++struct vcmd_wmask { ++ uint64_t wmask; ++ uint64_t mask; ++}; ++ ++ ++ ++/* OOM badness */ ++ ++#define VCMD_get_badness VC_CMD(MEMCTRL, 5, 0) ++#define VCMD_set_badness VC_CMD(MEMCTRL, 6, 0) ++ ++struct vcmd_badness_v0 { ++ int64_t bias; ++}; ++ ++#endif /* _UAPI_VS_CONTEXT_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/cvirt_cmd.h linux-4.9/include/uapi/vserver/cvirt_cmd.h +--- linux-4.9/include/uapi/vserver/cvirt_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/uapi/vserver/cvirt_cmd.h 2021-02-24 15:47:45.104409971 +0100 +@@ -0,0 +1,41 @@ ++#ifndef _UAPI_VS_CVIRT_CMD_H ++#define _UAPI_VS_CVIRT_CMD_H ++ ++ ++/* virtual host info name commands */ ++ ++#define VCMD_set_vhi_name VC_CMD(VHOST, 1, 0) ++#define VCMD_get_vhi_name VC_CMD(VHOST, 2, 0) ++ ++struct vcmd_vhi_name_v0 { ++ uint32_t field; ++ char name[65]; ++}; ++ ++ ++enum vhi_name_field { ++ VHIN_CONTEXT = 0, ++ VHIN_SYSNAME, ++ VHIN_NODENAME, ++ VHIN_RELEASE, ++ VHIN_VERSION, ++ VHIN_MACHINE, ++ VHIN_DOMAINNAME, ++}; ++ ++ ++ ++#define VCMD_virt_stat VC_CMD(VSTAT, 3, 0) ++ ++struct vcmd_virt_stat_v0 { ++ uint64_t offset; ++ uint64_t uptime; ++ uint32_t nr_threads; ++ uint32_t nr_running; ++ uint32_t nr_uninterruptible; ++ uint32_t nr_onhold; ++ uint32_t nr_forks; ++ uint32_t load[3]; ++}; ++ ++#endif /* _UAPI_VS_CVIRT_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/debug_cmd.h linux-4.9/include/uapi/vserver/debug_cmd.h +--- linux-4.9/include/uapi/vserver/debug_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/uapi/vserver/debug_cmd.h 2021-02-24 15:47:45.104409971 +0100 +@@ -0,0 +1,24 @@ ++#ifndef _UAPI_VS_DEBUG_CMD_H ++#define _UAPI_VS_DEBUG_CMD_H ++ ++ ++/* debug commands */ ++ ++#define VCMD_dump_history VC_CMD(DEBUG, 1, 0) ++ ++#define VCMD_read_history VC_CMD(DEBUG, 5, 0) ++#define VCMD_read_monitor VC_CMD(DEBUG, 6, 0) ++ ++struct vcmd_read_history_v0 { ++ uint32_t index; ++ uint32_t count; ++ char __user *data; ++}; ++ ++struct vcmd_read_monitor_v0 { ++ uint32_t index; ++ uint32_t count; ++ char __user *data; ++}; ++ ++#endif /* _UAPI_VS_DEBUG_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/device.h linux-4.9/include/uapi/vserver/device.h +--- linux-4.9/include/uapi/vserver/device.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/uapi/vserver/device.h 2021-02-24 15:47:45.104409971 +0100 +@@ -0,0 +1,12 @@ ++#ifndef _UAPI_VS_DEVICE_H ++#define _UAPI_VS_DEVICE_H ++ ++ ++#define DATTR_CREATE 0x00000001 ++#define DATTR_OPEN 0x00000002 ++ ++#define DATTR_REMAP 0x00000010 ++ ++#define DATTR_MASK 0x00000013 ++ ++#endif /* _UAPI_VS_DEVICE_H */ +diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/device_cmd.h linux-4.9/include/uapi/vserver/device_cmd.h +--- linux-4.9/include/uapi/vserver/device_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/uapi/vserver/device_cmd.h 2021-02-24 15:47:45.104409971 +0100 +@@ -0,0 +1,16 @@ ++#ifndef _UAPI_VS_DEVICE_CMD_H ++#define _UAPI_VS_DEVICE_CMD_H ++ ++ ++/* device vserver commands */ ++ ++#define VCMD_set_mapping VC_CMD(DEVICE, 1, 0) ++#define VCMD_unset_mapping VC_CMD(DEVICE, 2, 0) ++ ++struct vcmd_set_mapping_v0 { ++ const char __user *device; ++ const char __user *target; ++ uint32_t flags; ++}; ++ ++#endif /* _UAPI_VS_DEVICE_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/dlimit_cmd.h linux-4.9/include/uapi/vserver/dlimit_cmd.h +--- linux-4.9/include/uapi/vserver/dlimit_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/uapi/vserver/dlimit_cmd.h 2021-02-24 15:47:45.104409971 +0100 +@@ -0,0 +1,67 @@ ++#ifndef _UAPI_VS_DLIMIT_CMD_H ++#define _UAPI_VS_DLIMIT_CMD_H ++ ++ ++/* dlimit vserver commands */ ++ ++#define VCMD_add_dlimit VC_CMD(DLIMIT, 1, 0) ++#define VCMD_rem_dlimit VC_CMD(DLIMIT, 2, 0) ++ ++#define VCMD_set_dlimit VC_CMD(DLIMIT, 5, 0) ++#define VCMD_get_dlimit VC_CMD(DLIMIT, 6, 0) ++ ++struct vcmd_ctx_dlimit_base_v0 { ++ const char __user *name; ++ uint32_t flags; ++}; ++ ++struct vcmd_ctx_dlimit_v0 { ++ const char __user *name; ++ uint32_t space_used; /* used space in kbytes */ ++ uint32_t space_total; /* maximum space in kbytes */ ++ uint32_t inodes_used; /* used inodes */ ++ uint32_t inodes_total; /* maximum inodes */ ++ uint32_t reserved; /* reserved for root in % */ ++ uint32_t flags; ++}; ++ ++#define CDLIM_UNSET ((uint32_t)0UL) ++#define CDLIM_INFINITY ((uint32_t)~0UL) ++#define CDLIM_KEEP ((uint32_t)~1UL) ++ ++#define DLIME_UNIT 0 ++#define DLIME_KILO 1 ++#define DLIME_MEGA 2 ++#define DLIME_GIGA 3 ++ ++#define DLIMF_SHIFT 0x10 ++ ++#define DLIMS_USED 0 ++#define DLIMS_TOTAL 2 ++ ++static inline ++uint64_t dlimit_space_32to64(uint32_t val, uint32_t flags, int shift) ++{ ++ int exp = (flags & DLIMF_SHIFT) ? ++ (flags >> shift) & DLIME_GIGA : DLIME_KILO; ++ return ((uint64_t)val) << (10 * exp); ++} ++ ++static inline ++uint32_t dlimit_space_64to32(uint64_t val, uint32_t *flags, int shift) ++{ ++ int exp = 0; ++ ++ if (*flags & DLIMF_SHIFT) { ++ while (val > (1LL << 32) && (exp < 3)) { ++ val >>= 10; ++ exp++; ++ } ++ *flags &= ~(DLIME_GIGA << shift); ++ *flags |= exp << shift; ++ } else ++ val >>= 10; ++ return val; ++} ++ ++#endif /* _UAPI_VS_DLIMIT_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/inode.h linux-4.9/include/uapi/vserver/inode.h +--- linux-4.9/include/uapi/vserver/inode.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/uapi/vserver/inode.h 2021-02-24 15:47:45.104409971 +0100 +@@ -0,0 +1,23 @@ ++#ifndef _UAPI_VS_INODE_H ++#define _UAPI_VS_INODE_H ++ ++ ++#define IATTR_TAG 0x01000000 ++ ++#define IATTR_ADMIN 0x00000001 ++#define IATTR_WATCH 0x00000002 ++#define IATTR_HIDE 0x00000004 ++#define IATTR_FLAGS 0x00000007 ++ ++#define IATTR_BARRIER 0x00010000 ++#define IATTR_IXUNLINK 0x00020000 ++#define IATTR_IMMUTABLE 0x00040000 ++#define IATTR_COW 0x00080000 ++ ++ ++/* inode ioctls */ ++ ++#define FIOC_GETXFLG _IOR('x', 5, long) ++#define FIOC_SETXFLG _IOW('x', 6, long) ++ ++#endif /* _UAPI_VS_INODE_H */ +diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/inode_cmd.h linux-4.9/include/uapi/vserver/inode_cmd.h +--- linux-4.9/include/uapi/vserver/inode_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/uapi/vserver/inode_cmd.h 2021-02-24 15:47:45.104409971 +0100 +@@ -0,0 +1,26 @@ ++#ifndef _UAPI_VS_INODE_CMD_H ++#define _UAPI_VS_INODE_CMD_H ++ ++ ++/* inode vserver commands */ ++ ++#define VCMD_get_iattr VC_CMD(INODE, 1, 1) ++#define VCMD_set_iattr VC_CMD(INODE, 2, 1) ++ ++#define VCMD_fget_iattr VC_CMD(INODE, 3, 0) ++#define VCMD_fset_iattr VC_CMD(INODE, 4, 0) ++ ++struct vcmd_ctx_iattr_v1 { ++ const char __user *name; ++ uint32_t tag; ++ uint32_t flags; ++ uint32_t mask; ++}; ++ ++struct vcmd_ctx_fiattr_v0 { ++ uint32_t tag; ++ uint32_t flags; ++ uint32_t mask; ++}; ++ ++#endif /* _UAPI_VS_INODE_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/limit.h linux-4.9/include/uapi/vserver/limit.h +--- linux-4.9/include/uapi/vserver/limit.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/uapi/vserver/limit.h 2021-02-24 15:47:45.104409971 +0100 +@@ -0,0 +1,14 @@ ++#ifndef _UAPI_VS_LIMIT_H ++#define _UAPI_VS_LIMIT_H ++ ++ ++#define VLIMIT_NSOCK 16 ++#define VLIMIT_OPENFD 17 ++#define VLIMIT_ANON 18 ++#define VLIMIT_SHMEM 19 ++#define VLIMIT_SEMARY 20 ++#define VLIMIT_NSEMS 21 ++#define VLIMIT_DENTRY 22 ++#define VLIMIT_MAPPED 23 ++ ++#endif /* _UAPI_VS_LIMIT_H */ +diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/limit_cmd.h linux-4.9/include/uapi/vserver/limit_cmd.h +--- linux-4.9/include/uapi/vserver/limit_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/uapi/vserver/limit_cmd.h 2021-02-24 15:47:45.104409971 +0100 +@@ -0,0 +1,40 @@ ++#ifndef _UAPI_VS_LIMIT_CMD_H ++#define _UAPI_VS_LIMIT_CMD_H ++ ++ ++/* rlimit vserver commands */ ++ ++#define VCMD_get_rlimit VC_CMD(RLIMIT, 1, 0) ++#define VCMD_set_rlimit VC_CMD(RLIMIT, 2, 0) ++#define VCMD_get_rlimit_mask VC_CMD(RLIMIT, 3, 0) ++#define VCMD_reset_hits VC_CMD(RLIMIT, 7, 0) ++#define VCMD_reset_minmax VC_CMD(RLIMIT, 9, 0) ++ ++struct vcmd_ctx_rlimit_v0 { ++ uint32_t id; ++ uint64_t minimum; ++ uint64_t softlimit; ++ uint64_t maximum; ++}; ++ ++struct vcmd_ctx_rlimit_mask_v0 { ++ uint32_t minimum; ++ uint32_t softlimit; ++ uint32_t maximum; ++}; ++ ++#define VCMD_rlimit_stat VC_CMD(VSTAT, 1, 0) ++ ++struct vcmd_rlimit_stat_v0 { ++ uint32_t id; ++ uint32_t hits; ++ uint64_t value; ++ uint64_t minimum; ++ uint64_t maximum; ++}; ++ ++#define CRLIM_UNSET (0ULL) ++#define CRLIM_INFINITY (~0ULL) ++#define CRLIM_KEEP (~1ULL) ++ ++#endif /* _UAPI_VS_LIMIT_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/monitor.h linux-4.9/include/uapi/vserver/monitor.h +--- linux-4.9/include/uapi/vserver/monitor.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/uapi/vserver/monitor.h 2021-02-24 15:47:45.104409971 +0100 +@@ -0,0 +1,96 @@ ++#ifndef _UAPI_VS_MONITOR_H ++#define _UAPI_VS_MONITOR_H ++ ++#include ++ ++ ++enum { ++ VXM_UNUSED = 0, ++ ++ VXM_SYNC = 0x10, ++ ++ VXM_UPDATE = 0x20, ++ VXM_UPDATE_1, ++ VXM_UPDATE_2, ++ ++ VXM_RQINFO_1 = 0x24, ++ VXM_RQINFO_2, ++ ++ VXM_ACTIVATE = 0x40, ++ VXM_DEACTIVATE, ++ VXM_IDLE, ++ ++ VXM_HOLD = 0x44, ++ VXM_UNHOLD, ++ ++ VXM_MIGRATE = 0x48, ++ VXM_RESCHED, ++ ++ /* all other bits are flags */ ++ VXM_SCHED = 0x80, ++}; ++ ++struct _vxm_update_1 { ++ uint32_t tokens_max; ++ uint32_t fill_rate; ++ uint32_t interval; ++}; ++ ++struct _vxm_update_2 { ++ uint32_t tokens_min; ++ uint32_t fill_rate; ++ uint32_t interval; ++}; ++ ++struct _vxm_rqinfo_1 { ++ uint16_t running; ++ uint16_t onhold; ++ uint16_t iowait; ++ uint16_t uintr; ++ uint32_t idle_tokens; ++}; ++ ++struct _vxm_rqinfo_2 { ++ uint32_t norm_time; ++ uint32_t idle_time; ++ uint32_t idle_skip; ++}; ++ ++struct _vxm_sched { ++ uint32_t tokens; ++ uint32_t norm_time; ++ uint32_t idle_time; ++}; ++ ++struct _vxm_task { ++ uint16_t pid; ++ uint16_t state; ++}; ++ ++struct _vxm_event { ++ uint32_t jif; ++ union { ++ uint32_t seq; ++ uint32_t sec; ++ }; ++ union { ++ uint32_t tokens; ++ uint32_t nsec; ++ struct _vxm_task tsk; ++ }; +}; + +struct _vx_mon_entry { @@ -12567,14 +12234,13 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/monitor.h linux-3.7-vs2.3. + }; +}; + -+ -+#endif /* _VX_MONITOR_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/network.h linux-3.7-vs2.3.5.1/include/linux/vserver/network.h ---- linux-3.7/include/linux/vserver/network.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/network.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,148 @@ -+#ifndef _VX_NETWORK_H -+#define _VX_NETWORK_H ++#endif /* _UAPI_VS_MONITOR_H */ +diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/network.h linux-4.9/include/uapi/vserver/network.h +--- linux-4.9/include/uapi/vserver/network.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/uapi/vserver/network.h 2021-02-24 15:47:45.104409971 +0100 +@@ -0,0 +1,76 @@ ++#ifndef _UAPI_VS_NETWORK_H ++#define _UAPI_VS_NETWORK_H + +#include + @@ -12648,95 +12314,19 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/network.h linux-3.7-vs2.3. +#define NXA_MASK_BIND (NXA_MASK_ALL | NXA_MOD_BCAST | NXA_MOD_LBACK) +#define NXA_MASK_SHOW (NXA_MASK_ALL | NXA_LOOPBACK) + -+#ifdef __KERNEL__ -+ -+#include -+#include -+#include -+#include -+#include -+#include -+ -+struct nx_addr_v4 { -+ struct nx_addr_v4 *next; -+ struct in_addr ip[2]; -+ struct in_addr mask; -+ uint16_t type; -+ uint16_t flags; -+}; -+ -+struct nx_addr_v6 { -+ struct nx_addr_v6 *next; -+ struct in6_addr ip; -+ struct in6_addr mask; -+ uint32_t prefix; -+ uint16_t type; -+ uint16_t flags; -+}; -+ -+struct nx_info { -+ struct hlist_node nx_hlist; /* linked list of nxinfos */ -+ nid_t nx_id; /* vnet id */ -+ atomic_t nx_usecnt; /* usage count */ -+ atomic_t nx_tasks; /* tasks count */ -+ int nx_state; /* context state */ -+ -+ uint64_t nx_flags; /* network flag word */ -+ uint64_t nx_ncaps; /* network capabilities */ -+ -+ struct in_addr v4_lback; /* Loopback address */ -+ struct in_addr v4_bcast; /* Broadcast address */ -+ struct nx_addr_v4 v4; /* First/Single ipv4 address */ -+#ifdef CONFIG_IPV6 -+ struct nx_addr_v6 v6; /* First/Single ipv6 address */ -+#endif -+ char nx_name[65]; /* network context name */ -+}; -+ -+ -+/* status flags */ -+ -+#define NXS_HASHED 0x0001 -+#define NXS_SHUTDOWN 0x0100 -+#define NXS_RELEASED 0x8000 -+ -+extern struct nx_info *lookup_nx_info(int); -+ -+extern int get_nid_list(int, unsigned int *, int); -+extern int nid_is_hashed(nid_t); -+ -+extern int nx_migrate_task(struct task_struct *, struct nx_info *); -+ -+extern long vs_net_change(struct nx_info *, unsigned int); -+ -+struct sock; -+ -+ -+#define NX_IPV4(n) ((n)->v4.type != NXA_TYPE_NONE) -+#ifdef CONFIG_IPV6 -+#define NX_IPV6(n) ((n)->v6.type != NXA_TYPE_NONE) -+#else -+#define NX_IPV6(n) (0) -+#endif -+ -+#endif /* __KERNEL__ */ -+#endif /* _VX_NETWORK_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/network_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/network_cmd.h ---- linux-3.7/include/linux/vserver/network_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/network_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,164 @@ -+#ifndef _VX_NETWORK_CMD_H -+#define _VX_NETWORK_CMD_H ++#endif /* _UAPI_VS_NETWORK_H */ +diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/network_cmd.h linux-4.9/include/uapi/vserver/network_cmd.h +--- linux-4.9/include/uapi/vserver/network_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/uapi/vserver/network_cmd.h 2021-02-24 15:47:45.104409971 +0100 +@@ -0,0 +1,123 @@ ++#ifndef _UAPI_VS_NETWORK_CMD_H ++#define _UAPI_VS_NETWORK_CMD_H + + +/* vinfo commands */ + +#define VCMD_task_nid VC_CMD(VINFO, 2, 0) + -+#ifdef __KERNEL__ -+extern int vc_task_nid(uint32_t); -+ -+#endif /* __KERNEL__ */ + +#define VCMD_nx_info VC_CMD(VINFO, 6, 0) + @@ -12745,10 +12335,6 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/network_cmd.h linux-3.7-vs + /* more to come */ +}; + -+#ifdef __KERNEL__ -+extern int vc_nx_info(struct nx_info *, void __user *); -+ -+#endif /* __KERNEL__ */ + +#include +#include @@ -12831,29 +12417,6 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/network_cmd.h linux-3.7-vs +}; + + -+#ifdef __KERNEL__ -+extern int vc_net_create(uint32_t, void __user *); -+extern int vc_net_migrate(struct nx_info *, void __user *); -+ -+extern int vc_net_add(struct nx_info *, void __user *); -+extern int vc_net_remove(struct nx_info *, void __user *); -+ -+extern int vc_net_add_ipv4_v1(struct nx_info *, void __user *); -+extern int vc_net_add_ipv4(struct nx_info *, void __user *); -+ -+extern int vc_net_rem_ipv4_v1(struct nx_info *, void __user *); -+extern int vc_net_rem_ipv4(struct nx_info *, void __user *); -+ -+extern int vc_net_add_ipv6(struct nx_info *, void __user *); -+extern int vc_net_remove_ipv6(struct nx_info *, void __user *); -+ -+extern int vc_add_match_ipv4(struct nx_info *, void __user *); -+extern int vc_get_match_ipv4(struct nx_info *, void __user *); -+ -+extern int vc_add_match_ipv6(struct nx_info *, void __user *); -+extern int vc_get_match_ipv6(struct nx_info *, void __user *); -+ -+#endif /* __KERNEL__ */ + + +/* flag commands */ @@ -12866,11 +12429,6 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/network_cmd.h linux-3.7-vs + uint64_t mask; +}; + -+#ifdef __KERNEL__ -+extern int vc_get_nflags(struct nx_info *, void __user *); -+extern int vc_set_nflags(struct nx_info *, void __user *); -+ -+#endif /* __KERNEL__ */ + + +/* network caps commands */ @@ -12883,203 +12441,30 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/network_cmd.h linux-3.7-vs + uint64_t cmask; +}; + -+#ifdef __KERNEL__ -+extern int vc_get_ncaps(struct nx_info *, void __user *); -+extern int vc_set_ncaps(struct nx_info *, void __user *); -+ -+#endif /* __KERNEL__ */ -+#endif /* _VX_CONTEXT_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/percpu.h linux-3.7-vs2.3.5.1/include/linux/vserver/percpu.h ---- linux-3.7/include/linux/vserver/percpu.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/percpu.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,14 @@ -+#ifndef _VX_PERCPU_H -+#define _VX_PERCPU_H -+ -+#include "cvirt_def.h" -+#include "sched_def.h" -+ -+struct _vx_percpu { -+ struct _vx_cvirt_pc cvirt; -+ struct _vx_sched_pc sched; -+}; -+ -+#define PERCPU_PERCTX (sizeof(struct _vx_percpu)) -+ -+#endif /* _VX_PERCPU_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/pid.h linux-3.7-vs2.3.5.1/include/linux/vserver/pid.h ---- linux-3.7/include/linux/vserver/pid.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/pid.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,51 @@ -+#ifndef _VSERVER_PID_H -+#define _VSERVER_PID_H -+ -+/* pid faking stuff */ -+ -+#define vx_info_map_pid(v, p) \ -+ __vx_info_map_pid((v), (p), __func__, __FILE__, __LINE__) -+#define vx_info_map_tgid(v,p) vx_info_map_pid(v,p) -+#define vx_map_pid(p) vx_info_map_pid(current_vx_info(), p) -+#define vx_map_tgid(p) vx_map_pid(p) -+ -+static inline int __vx_info_map_pid(struct vx_info *vxi, int pid, -+ const char *func, const char *file, int line) -+{ -+ if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) { -+ vxfprintk(VXD_CBIT(cvirt, 2), -+ "vx_map_tgid: %p/%llx: %d -> %d", -+ vxi, (long long)vxi->vx_flags, pid, -+ (pid && pid == vxi->vx_initpid) ? 1 : pid, -+ func, file, line); -+ if (pid == 0) -+ return 0; -+ if (pid == vxi->vx_initpid) -+ return 1; -+ } -+ return pid; -+} -+ -+#define vx_info_rmap_pid(v, p) \ -+ __vx_info_rmap_pid((v), (p), __func__, __FILE__, __LINE__) -+#define vx_rmap_pid(p) vx_info_rmap_pid(current_vx_info(), p) -+#define vx_rmap_tgid(p) vx_rmap_pid(p) -+ -+static inline int __vx_info_rmap_pid(struct vx_info *vxi, int pid, -+ const char *func, const char *file, int line) -+{ -+ if (vx_info_flags(vxi, VXF_INFO_INIT, 0)) { -+ vxfprintk(VXD_CBIT(cvirt, 2), -+ "vx_rmap_tgid: %p/%llx: %d -> %d", -+ vxi, (long long)vxi->vx_flags, pid, -+ (pid == 1) ? vxi->vx_initpid : pid, -+ func, file, line); -+ if ((pid == 1) && vxi->vx_initpid) -+ return vxi->vx_initpid; -+ if (pid == vxi->vx_initpid) -+ return ~0U; -+ } -+ return pid; -+} -+ -+#endif -diff -NurpP --minimal linux-3.7/include/linux/vserver/sched.h linux-3.7-vs2.3.5.1/include/linux/vserver/sched.h ---- linux-3.7/include/linux/vserver/sched.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/sched.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,23 @@ -+#ifndef _VX_SCHED_H -+#define _VX_SCHED_H -+ -+ -+#ifdef __KERNEL__ -+ -+struct timespec; -+ -+void vx_vsi_uptime(struct timespec *, struct timespec *); -+ -+ -+struct vx_info; -+ -+void vx_update_load(struct vx_info *); -+ -+ -+void vx_update_sched_param(struct _vx_sched *sched, -+ struct _vx_sched_pc *sched_pc); -+ -+#endif /* __KERNEL__ */ -+#else /* _VX_SCHED_H */ -+#warning duplicate inclusion -+#endif /* _VX_SCHED_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/sched_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/sched_cmd.h ---- linux-3.7/include/linux/vserver/sched_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/sched_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,21 @@ -+#ifndef _VX_SCHED_CMD_H -+#define _VX_SCHED_CMD_H -+ -+ -+struct vcmd_prio_bias { -+ int32_t cpu_id; -+ int32_t prio_bias; -+}; -+ -+#define VCMD_set_prio_bias VC_CMD(SCHED, 4, 0) -+#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0) -+ -+#ifdef __KERNEL__ -+ -+#include -+ -+extern int vc_set_prio_bias(struct vx_info *, void __user *); -+extern int vc_get_prio_bias(struct vx_info *, void __user *); -+ -+#endif /* __KERNEL__ */ -+#endif /* _VX_SCHED_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/sched_def.h linux-3.7-vs2.3.5.1/include/linux/vserver/sched_def.h ---- linux-3.7/include/linux/vserver/sched_def.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/sched_def.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,38 @@ -+#ifndef _VX_SCHED_DEF_H -+#define _VX_SCHED_DEF_H -+ -+#include -+#include -+#include -+#include -+#include -+ -+ -+/* context sub struct */ -+ -+struct _vx_sched { -+ int prio_bias; /* bias offset for priority */ -+ -+ cpumask_t update; /* CPUs which should update */ -+}; -+ -+struct _vx_sched_pc { -+ int prio_bias; /* bias offset for priority */ -+ -+ uint64_t user_ticks; /* token tick events */ -+ uint64_t sys_ticks; /* token tick events */ -+ uint64_t hold_ticks; /* token ticks paused */ -+}; -+ -+ -+#ifdef CONFIG_VSERVER_DEBUG -+ -+static inline void __dump_vx_sched(struct _vx_sched *sched) -+{ -+ printk("\t_vx_sched:\n"); -+ printk("\t priority = %4d\n", sched->prio_bias); -+} -+ -+#endif -+ -+#endif /* _VX_SCHED_DEF_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/signal.h linux-3.7-vs2.3.5.1/include/linux/vserver/signal.h ---- linux-3.7/include/linux/vserver/signal.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/signal.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,14 @@ -+#ifndef _VX_SIGNAL_H -+#define _VX_SIGNAL_H -+ ++#endif /* _UAPI_VS_NETWORK_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/sched_cmd.h linux-4.9/include/uapi/vserver/sched_cmd.h +--- linux-4.9/include/uapi/vserver/sched_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/uapi/vserver/sched_cmd.h 2021-02-24 15:47:45.104409971 +0100 +@@ -0,0 +1,13 @@ ++#ifndef _UAPI_VS_SCHED_CMD_H ++#define _UAPI_VS_SCHED_CMD_H + -+#ifdef __KERNEL__ + -+struct vx_info; ++struct vcmd_prio_bias { ++ int32_t cpu_id; ++ int32_t prio_bias; ++}; + -+int vx_info_kill(struct vx_info *, int, int); ++#define VCMD_set_prio_bias VC_CMD(SCHED, 4, 0) ++#define VCMD_get_prio_bias VC_CMD(SCHED, 5, 0) + -+#endif /* __KERNEL__ */ -+#else /* _VX_SIGNAL_H */ -+#warning duplicate inclusion -+#endif /* _VX_SIGNAL_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/signal_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/signal_cmd.h ---- linux-3.7/include/linux/vserver/signal_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/signal_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,43 @@ -+#ifndef _VX_SIGNAL_CMD_H -+#define _VX_SIGNAL_CMD_H ++#endif /* _UAPI_VS_SCHED_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/signal_cmd.h linux-4.9/include/uapi/vserver/signal_cmd.h +--- linux-4.9/include/uapi/vserver/signal_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/uapi/vserver/signal_cmd.h 2021-02-24 15:47:45.107743409 +0100 +@@ -0,0 +1,31 @@ ++#ifndef _UAPI_VS_SIGNAL_CMD_H ++#define _UAPI_VS_SIGNAL_CMD_H + + +/* signalling vserver commands */ @@ -13097,12 +12482,6 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/signal_cmd.h linux-3.7-vs2 + int32_t exit_code; +}; + -+#ifdef __KERNEL__ -+ -+extern int vc_ctx_kill(struct vx_info *, void __user *); -+extern int vc_wait_exit(struct vx_info *, void __user *); -+ -+#endif /* __KERNEL__ */ + +/* process alteration commands */ + @@ -13114,35 +12493,13 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/signal_cmd.h linux-3.7-vs2 + uint32_t mask; +}; + -+#ifdef __KERNEL__ -+ -+extern int vc_get_pflags(uint32_t pid, void __user *); -+extern int vc_set_pflags(uint32_t pid, void __user *); -+ -+#endif /* __KERNEL__ */ -+#endif /* _VX_SIGNAL_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/space.h linux-3.7-vs2.3.5.1/include/linux/vserver/space.h ---- linux-3.7/include/linux/vserver/space.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/space.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,12 @@ -+#ifndef _VX_SPACE_H -+#define _VX_SPACE_H -+ -+#include -+ -+struct vx_info; -+ -+int vx_set_space(struct vx_info *vxi, unsigned long mask, unsigned index); -+ -+#else /* _VX_SPACE_H */ -+#warning duplicate inclusion -+#endif /* _VX_SPACE_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/space_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/space_cmd.h ---- linux-3.7/include/linux/vserver/space_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/space_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,38 @@ -+#ifndef _VX_SPACE_CMD_H -+#define _VX_SPACE_CMD_H ++#endif /* _UAPI_VS_SIGNAL_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/space_cmd.h linux-4.9/include/uapi/vserver/space_cmd.h +--- linux-4.9/include/uapi/vserver/space_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/uapi/vserver/space_cmd.h 2021-02-24 15:47:45.107743409 +0100 +@@ -0,0 +1,28 @@ ++#ifndef _UAPI_VS_SPACE_CMD_H ++#define _UAPI_VS_SPACE_CMD_H + + +#define VCMD_enter_space_v0 VC_CMD(PROCALT, 1, 0) @@ -13168,596 +12525,144 @@ diff -NurpP --minimal linux-3.7/include/linux/vserver/space_cmd.h linux-3.7-vs2. + uint32_t index; +}; + -+ -+#ifdef __KERNEL__ -+ -+extern int vc_enter_space_v1(struct vx_info *, void __user *); -+extern int vc_set_space_v1(struct vx_info *, void __user *); -+extern int vc_enter_space(struct vx_info *, void __user *); -+extern int vc_set_space(struct vx_info *, void __user *); -+extern int vc_get_space_mask(void __user *, int); -+ -+#endif /* __KERNEL__ */ -+#endif /* _VX_SPACE_CMD_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/switch.h linux-3.7-vs2.3.5.1/include/linux/vserver/switch.h ---- linux-3.7/include/linux/vserver/switch.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/switch.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,98 @@ -+#ifndef _VX_SWITCH_H -+#define _VX_SWITCH_H ++#endif /* _UAPI_VS_SPACE_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/switch.h linux-4.9/include/uapi/vserver/switch.h +--- linux-4.9/include/uapi/vserver/switch.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/uapi/vserver/switch.h 2021-02-24 15:47:45.107743409 +0100 +@@ -0,0 +1,90 @@ ++#ifndef _UAPI_VS_SWITCH_H ++#define _UAPI_VS_SWITCH_H + +#include + + +#define VC_CATEGORY(c) (((c) >> 24) & 0x3F) -+#define VC_COMMAND(c) (((c) >> 16) & 0xFF) -+#define VC_VERSION(c) ((c) & 0xFFF) -+ -+#define VC_CMD(c, i, v) ((((VC_CAT_ ## c) & 0x3F) << 24) \ -+ | (((i) & 0xFF) << 16) | ((v) & 0xFFF)) -+ -+/* -+ -+ Syscall Matrix V2.8 -+ -+ |VERSION|CREATE |MODIFY |MIGRATE|CONTROL|EXPERIM| |SPECIAL|SPECIAL| -+ |STATS |DESTROY|ALTER |CHANGE |LIMIT |TEST | | | | -+ |INFO |SETUP | |MOVE | | | | | | -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -+ SYSTEM |VERSION|VSETUP |VHOST | | | | |DEVICE | | -+ HOST | 00| 01| 02| 03| 04| 05| | 06| 07| -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -+ CPU | |VPROC |PROCALT|PROCMIG|PROCTRL| | |SCHED. | | -+ PROCESS| 08| 09| 10| 11| 12| 13| | 14| 15| -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -+ MEMORY | | | | |MEMCTRL| | |SWAP | | -+ | 16| 17| 18| 19| 20| 21| | 22| 23| -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -+ NETWORK| |VNET |NETALT |NETMIG |NETCTL | | |SERIAL | | -+ | 24| 25| 26| 27| 28| 29| | 30| 31| -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -+ DISK | | | |TAGMIG |DLIMIT | | |INODE | | -+ VFS | 32| 33| 34| 35| 36| 37| | 38| 39| -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -+ OTHER |VSTAT | | | | | | |VINFO | | -+ | 40| 41| 42| 43| 44| 45| | 46| 47| -+ =======+=======+=======+=======+=======+=======+=======+ +=======+=======+ -+ SPECIAL|EVENT | | | |FLAGS | | |VSPACE | | -+ | 48| 49| 50| 51| 52| 53| | 54| 55| -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -+ SPECIAL|DEBUG | | | |RLIMIT |SYSCALL| | |COMPAT | -+ | 56| 57| 58| 59| 60|TEST 61| | 62| 63| -+ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ -+ -+*/ -+ -+#define VC_CAT_VERSION 0 -+ -+#define VC_CAT_VSETUP 1 -+#define VC_CAT_VHOST 2 -+ -+#define VC_CAT_DEVICE 6 -+ -+#define VC_CAT_VPROC 9 -+#define VC_CAT_PROCALT 10 -+#define VC_CAT_PROCMIG 11 -+#define VC_CAT_PROCTRL 12 -+ -+#define VC_CAT_SCHED 14 -+#define VC_CAT_MEMCTRL 20 -+ -+#define VC_CAT_VNET 25 -+#define VC_CAT_NETALT 26 -+#define VC_CAT_NETMIG 27 -+#define VC_CAT_NETCTRL 28 -+ -+#define VC_CAT_TAGMIG 35 -+#define VC_CAT_DLIMIT 36 -+#define VC_CAT_INODE 38 -+ -+#define VC_CAT_VSTAT 40 -+#define VC_CAT_VINFO 46 -+#define VC_CAT_EVENT 48 -+ -+#define VC_CAT_FLAGS 52 -+#define VC_CAT_VSPACE 54 -+#define VC_CAT_DEBUG 56 -+#define VC_CAT_RLIMIT 60 -+ -+#define VC_CAT_SYSTEST 61 -+#define VC_CAT_COMPAT 63 -+ -+/* query version */ -+ -+#define VCMD_get_version VC_CMD(VERSION, 0, 0) -+#define VCMD_get_vci VC_CMD(VERSION, 1, 0) -+ -+ -+#ifdef __KERNEL__ -+ -+#include -+ -+#endif /* __KERNEL__ */ -+ -+#endif /* _VX_SWITCH_H */ -+ -diff -NurpP --minimal linux-3.7/include/linux/vserver/tag.h linux-3.7-vs2.3.5.1/include/linux/vserver/tag.h ---- linux-3.7/include/linux/vserver/tag.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/tag.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,143 @@ -+#ifndef _DX_TAG_H -+#define _DX_TAG_H -+ -+#include -+ -+ -+#define DX_TAG(in) (IS_TAGGED(in)) -+ -+ -+#ifdef CONFIG_TAG_NFSD -+#define DX_TAG_NFSD 1 -+#else -+#define DX_TAG_NFSD 0 -+#endif -+ -+ -+#ifdef CONFIG_TAGGING_NONE -+ -+#define MAX_UID 0xFFFFFFFF -+#define MAX_GID 0xFFFFFFFF -+ -+#define INOTAG_TAG(cond, uid, gid, tag) (0) -+ -+#define TAGINO_UID(cond, uid, tag) (uid) -+#define TAGINO_GID(cond, gid, tag) (gid) -+ -+#endif -+ -+ -+#ifdef CONFIG_TAGGING_GID16 -+ -+#define MAX_UID 0xFFFFFFFF -+#define MAX_GID 0x0000FFFF -+ -+#define INOTAG_TAG(cond, uid, gid, tag) \ -+ ((cond) ? (((gid) >> 16) & 0xFFFF) : 0) -+ -+#define TAGINO_UID(cond, uid, tag) (uid) -+#define TAGINO_GID(cond, gid, tag) \ -+ ((cond) ? (((gid) & 0xFFFF) | ((tag) << 16)) : (gid)) -+ -+#endif -+ -+ -+#ifdef CONFIG_TAGGING_ID24 -+ -+#define MAX_UID 0x00FFFFFF -+#define MAX_GID 0x00FFFFFF -+ -+#define INOTAG_TAG(cond, uid, gid, tag) \ -+ ((cond) ? ((((uid) >> 16) & 0xFF00) | (((gid) >> 24) & 0xFF)) : 0) -+ -+#define TAGINO_UID(cond, uid, tag) \ -+ ((cond) ? (((uid) & 0xFFFFFF) | (((tag) & 0xFF00) << 16)) : (uid)) -+#define TAGINO_GID(cond, gid, tag) \ -+ ((cond) ? (((gid) & 0xFFFFFF) | (((tag) & 0x00FF) << 24)) : (gid)) -+ -+#endif -+ -+ -+#ifdef CONFIG_TAGGING_UID16 -+ -+#define MAX_UID 0x0000FFFF -+#define MAX_GID 0xFFFFFFFF -+ -+#define INOTAG_TAG(cond, uid, gid, tag) \ -+ ((cond) ? (((uid) >> 16) & 0xFFFF) : 0) -+ -+#define TAGINO_UID(cond, uid, tag) \ -+ ((cond) ? (((uid) & 0xFFFF) | ((tag) << 16)) : (uid)) -+#define TAGINO_GID(cond, gid, tag) (gid) -+ -+#endif -+ -+ -+#ifdef CONFIG_TAGGING_INTERN -+ -+#define MAX_UID 0xFFFFFFFF -+#define MAX_GID 0xFFFFFFFF -+ -+#define INOTAG_TAG(cond, uid, gid, tag) \ -+ ((cond) ? (tag) : 0) -+ -+#define TAGINO_UID(cond, uid, tag) (uid) -+#define TAGINO_GID(cond, gid, tag) (gid) -+ -+#endif -+ -+ -+#ifndef CONFIG_TAGGING_NONE -+#define dx_current_fstag(sb) \ -+ ((sb)->s_flags & MS_TAGGED ? dx_current_tag() : 0) -+#else -+#define dx_current_fstag(sb) (0) -+#endif -+ -+#ifndef CONFIG_TAGGING_INTERN -+#define TAGINO_TAG(cond, tag) (0) -+#else -+#define TAGINO_TAG(cond, tag) ((cond) ? (tag) : 0) -+#endif -+ -+#define INOTAG_UID(cond, uid, gid) \ -+ ((cond) ? ((uid) & MAX_UID) : (uid)) -+#define INOTAG_GID(cond, uid, gid) \ -+ ((cond) ? ((gid) & MAX_GID) : (gid)) -+ -+ -+static inline uid_t dx_map_uid(uid_t uid) -+{ -+ if ((uid > MAX_UID) && (uid != -1)) -+ uid = -2; -+ return (uid & MAX_UID); -+} -+ -+static inline gid_t dx_map_gid(gid_t gid) -+{ -+ if ((gid > MAX_GID) && (gid != -1)) -+ gid = -2; -+ return (gid & MAX_GID); -+} ++#define VC_COMMAND(c) (((c) >> 16) & 0xFF) ++#define VC_VERSION(c) ((c) & 0xFFF) + -+struct peer_tag { -+ int32_t xid; -+ int32_t nid; -+}; ++#define VC_CMD(c, i, v) ((((VC_CAT_ ## c) & 0x3F) << 24) \ ++ | (((i) & 0xFF) << 16) | ((v) & 0xFFF)) + -+#define dx_notagcheck(sb) ((sb) && ((sb)->s_flags & MS_NOTAGCHECK)) ++/* + -+int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags, -+ unsigned long *flags); ++ Syscall Matrix V2.8 + -+#ifdef CONFIG_PROPAGATE ++ |VERSION|CREATE |MODIFY |MIGRATE|CONTROL|EXPERIM| |SPECIAL|SPECIAL| ++ |STATS |DESTROY|ALTER |CHANGE |LIMIT |TEST | | | | ++ |INFO |SETUP | |MOVE | | | | | | ++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ ++ SYSTEM |VERSION|VSETUP |VHOST | | | | |DEVICE | | ++ HOST | 00| 01| 02| 03| 04| 05| | 06| 07| ++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ ++ CPU | |VPROC |PROCALT|PROCMIG|PROCTRL| | |SCHED. | | ++ PROCESS| 08| 09| 10| 11| 12| 13| | 14| 15| ++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ ++ MEMORY | | | | |MEMCTRL| | |SWAP | | ++ | 16| 17| 18| 19| 20| 21| | 22| 23| ++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ ++ NETWORK| |VNET |NETALT |NETMIG |NETCTL | | |SERIAL | | ++ | 24| 25| 26| 27| 28| 29| | 30| 31| ++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ ++ DISK | | | |TAGMIG |DLIMIT | | |INODE | | ++ VFS | 32| 33| 34| 35| 36| 37| | 38| 39| ++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ ++ OTHER |VSTAT | | | | | | |VINFO | | ++ | 40| 41| 42| 43| 44| 45| | 46| 47| ++ =======+=======+=======+=======+=======+=======+=======+ +=======+=======+ ++ SPECIAL|EVENT | | | |FLAGS | | |VSPACE | | ++ | 48| 49| 50| 51| 52| 53| | 54| 55| ++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ ++ SPECIAL|DEBUG | | | |RLIMIT |SYSCALL| | |COMPAT | ++ | 56| 57| 58| 59| 60|TEST 61| | 62| 63| ++ -------+-------+-------+-------+-------+-------+-------+ +-------+-------+ + -+void __dx_propagate_tag(struct nameidata *nd, struct inode *inode); ++*/ + -+#define dx_propagate_tag(n, i) __dx_propagate_tag(n, i) ++#define VC_CAT_VERSION 0 + -+#else -+#define dx_propagate_tag(n, i) do { } while (0) -+#endif ++#define VC_CAT_VSETUP 1 ++#define VC_CAT_VHOST 2 + -+#endif /* _DX_TAG_H */ -diff -NurpP --minimal linux-3.7/include/linux/vserver/tag_cmd.h linux-3.7-vs2.3.5.1/include/linux/vserver/tag_cmd.h ---- linux-3.7/include/linux/vserver/tag_cmd.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/linux/vserver/tag_cmd.h 2012-12-11 15:56:32.000000000 +0000 -@@ -0,0 +1,22 @@ -+#ifndef _VX_TAG_CMD_H -+#define _VX_TAG_CMD_H ++#define VC_CAT_DEVICE 6 + ++#define VC_CAT_VPROC 9 ++#define VC_CAT_PROCALT 10 ++#define VC_CAT_PROCMIG 11 ++#define VC_CAT_PROCTRL 12 + -+/* vinfo commands */ ++#define VC_CAT_SCHED 14 ++#define VC_CAT_MEMCTRL 20 + -+#define VCMD_task_tag VC_CMD(VINFO, 3, 0) ++#define VC_CAT_VNET 25 ++#define VC_CAT_NETALT 26 ++#define VC_CAT_NETMIG 27 ++#define VC_CAT_NETCTRL 28 + -+#ifdef __KERNEL__ -+extern int vc_task_tag(uint32_t); ++#define VC_CAT_TAGMIG 35 ++#define VC_CAT_DLIMIT 36 ++#define VC_CAT_INODE 38 + -+#endif /* __KERNEL__ */ ++#define VC_CAT_VSTAT 40 ++#define VC_CAT_VINFO 46 ++#define VC_CAT_EVENT 48 + -+/* context commands */ ++#define VC_CAT_FLAGS 52 ++#define VC_CAT_VSPACE 54 ++#define VC_CAT_DEBUG 56 ++#define VC_CAT_RLIMIT 60 + -+#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0) ++#define VC_CAT_SYSTEST 61 ++#define VC_CAT_COMPAT 63 + -+#ifdef __KERNEL__ -+extern int vc_tag_migrate(uint32_t); ++/* query version */ + -+#endif /* __KERNEL__ */ -+#endif /* _VX_TAG_CMD_H */ -diff -NurpP --minimal linux-3.7/include/net/addrconf.h linux-3.7-vs2.3.5.1/include/net/addrconf.h ---- linux-3.7/include/net/addrconf.h 2012-12-11 15:47:46.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/net/addrconf.h 2012-12-11 15:56:32.000000000 +0000 -@@ -81,7 +81,8 @@ extern int ipv6_dev_get_saddr(struct n - const struct net_device *dev, - const struct in6_addr *daddr, - unsigned int srcprefs, -- struct in6_addr *saddr); -+ struct in6_addr *saddr, -+ struct nx_info *nxi); - extern int ipv6_get_lladdr(struct net_device *dev, - struct in6_addr *addr, - unsigned char banned_flags); -diff -NurpP --minimal linux-3.7/include/net/af_unix.h linux-3.7-vs2.3.5.1/include/net/af_unix.h ---- linux-3.7/include/net/af_unix.h 2012-10-04 13:27:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/net/af_unix.h 2012-12-11 15:56:32.000000000 +0000 -@@ -4,6 +4,7 @@ - #include - #include - #include -+#include - #include - - extern void unix_inflight(struct file *fp); -diff -NurpP --minimal linux-3.7/include/net/inet_timewait_sock.h linux-3.7-vs2.3.5.1/include/net/inet_timewait_sock.h ---- linux-3.7/include/net/inet_timewait_sock.h 2012-03-19 18:47:29.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/net/inet_timewait_sock.h 2012-12-11 15:56:32.000000000 +0000 -@@ -112,6 +112,10 @@ struct inet_timewait_sock { - #define tw_net __tw_common.skc_net - #define tw_daddr __tw_common.skc_daddr - #define tw_rcv_saddr __tw_common.skc_rcv_saddr -+#define tw_xid __tw_common.skc_xid -+#define tw_vx_info __tw_common.skc_vx_info -+#define tw_nid __tw_common.skc_nid -+#define tw_nx_info __tw_common.skc_nx_info - int tw_timeout; - volatile unsigned char tw_substate; - unsigned char tw_rcv_wscale; -diff -NurpP --minimal linux-3.7/include/net/ip6_route.h linux-3.7-vs2.3.5.1/include/net/ip6_route.h ---- linux-3.7/include/net/ip6_route.h 2012-10-04 13:27:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/net/ip6_route.h 2012-12-11 15:56:32.000000000 +0000 -@@ -97,7 +97,8 @@ extern int ip6_route_get_saddr(struct - struct rt6_info *rt, - const struct in6_addr *daddr, - unsigned int prefs, -- struct in6_addr *saddr); -+ struct in6_addr *saddr, -+ struct nx_info *nxi); - - extern struct rt6_info *rt6_lookup(struct net *net, - const struct in6_addr *daddr, -diff -NurpP --minimal linux-3.7/include/net/route.h linux-3.7-vs2.3.5.1/include/net/route.h ---- linux-3.7/include/net/route.h 2012-12-11 15:47:46.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/net/route.h 2012-12-11 15:56:32.000000000 +0000 -@@ -204,6 +204,9 @@ static inline void ip_rt_put(struct rtab - dst_release(&rt->dst); - } - -+#include -+#include ++#define VCMD_get_version VC_CMD(VERSION, 0, 0) ++#define VCMD_get_vci VC_CMD(VERSION, 1, 0) + - #define IPTOS_RT_MASK (IPTOS_TOS_MASK & ~3) - - extern const __u8 ip_tos2prio[16]; -@@ -253,6 +256,9 @@ static inline void ip_route_connect_init - protocol, flow_flags, dst, src, dport, sport); - } - -+extern struct rtable *ip_v4_find_src(struct net *net, struct nx_info *, -+ struct flowi4 *); ++#endif /* _UAPI_VS_SWITCH_H */ +diff -urNp -x '*.orig' linux-4.9/include/uapi/vserver/tag_cmd.h linux-4.9/include/uapi/vserver/tag_cmd.h +--- linux-4.9/include/uapi/vserver/tag_cmd.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/include/uapi/vserver/tag_cmd.h 2021-02-24 15:47:45.107743409 +0100 +@@ -0,0 +1,14 @@ ++#ifndef _UAPI_VS_TAG_CMD_H ++#define _UAPI_VS_TAG_CMD_H + - static inline struct rtable *ip_route_connect(struct flowi4 *fl4, - __be32 dst, __be32 src, u32 tos, - int oif, u8 protocol, -@@ -261,11 +267,25 @@ static inline struct rtable *ip_route_co - { - struct net *net = sock_net(sk); - struct rtable *rt; -+ struct nx_info *nx_info = current_nx_info(); - - ip_route_connect_init(fl4, dst, src, tos, oif, protocol, - sport, dport, sk, can_sleep); - -- if (!dst || !src) { -+ if (sk) -+ nx_info = sk->sk_nx_info; + -+ vxdprintk(VXD_CBIT(net, 4), -+ "ip_route_connect(%p) %p,%p;%lx", -+ sk, nx_info, sk->sk_socket, -+ (sk->sk_socket?sk->sk_socket->flags:0)); ++/* vinfo commands */ + -+ rt = ip_v4_find_src(net, nx_info, fl4); -+ if (IS_ERR(rt)) -+ return rt; -+ ip_rt_put(rt); ++#define VCMD_task_tag VC_CMD(VINFO, 3, 0) + -+ if (!fl4->daddr || !fl4->saddr) { - rt = __ip_route_output_key(net, fl4); - if (IS_ERR(rt)) - return rt; -diff -NurpP --minimal linux-3.7/include/net/sock.h linux-3.7-vs2.3.5.1/include/net/sock.h ---- linux-3.7/include/net/sock.h 2012-12-11 15:47:46.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/net/sock.h 2012-12-11 15:56:32.000000000 +0000 -@@ -171,6 +171,10 @@ struct sock_common { - #ifdef CONFIG_NET_NS - struct net *skc_net; - #endif -+ xid_t skc_xid; -+ struct vx_info *skc_vx_info; -+ nid_t skc_nid; -+ struct nx_info *skc_nx_info; - /* - * fields between dontcopy_begin/dontcopy_end - * are not copied in sock_copy() -@@ -283,6 +287,10 @@ struct sock { - #define sk_bind_node __sk_common.skc_bind_node - #define sk_prot __sk_common.skc_prot - #define sk_net __sk_common.skc_net -+#define sk_xid __sk_common.skc_xid -+#define sk_vx_info __sk_common.skc_vx_info -+#define sk_nid __sk_common.skc_nid -+#define sk_nx_info __sk_common.skc_nx_info - socket_lock_t sk_lock; - struct sk_buff_head sk_receive_queue; - /* -diff -NurpP --minimal linux-3.7/include/uapi/linux/capability.h linux-3.7-vs2.3.5.1/include/uapi/linux/capability.h ---- linux-3.7/include/uapi/linux/capability.h 2012-12-11 15:47:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/uapi/linux/capability.h 2012-12-11 16:08:57.000000000 +0000 -@@ -259,6 +259,7 @@ struct vfs_cap_data { - arbitrary SCSI commands */ - /* Allow setting encryption key on loopback filesystem */ - /* Allow setting zone reclaim policy */ -+/* Allow the selection of a security context */ - - #define CAP_SYS_ADMIN 21 - -@@ -345,7 +346,12 @@ struct vfs_cap_data { - - #define CAP_LAST_CAP CAP_BLOCK_SUSPEND - --#define cap_valid(x) ((x) >= 0 && (x) <= CAP_LAST_CAP) -+/* Allow context manipulations */ -+/* Allow changing context info on files */ + -+#define CAP_CONTEXT 63 ++/* context commands */ + -+#define cap_valid(x) ((x) >= 0 && ((x) <= CAP_LAST_CAP || (x) == CAP_CONTEXT)) - - /* - * Bit location of each capability (used by user-space library and kernel) -diff -NurpP --minimal linux-3.7/include/uapi/linux/fs.h linux-3.7-vs2.3.5.1/include/uapi/linux/fs.h ---- linux-3.7/include/uapi/linux/fs.h 2012-12-11 15:47:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/uapi/linux/fs.h 2012-12-11 16:35:06.000000000 +0000 -@@ -86,6 +86,9 @@ struct inodes_stat_t { - #define MS_KERNMOUNT (1<<22) /* this is a kern_mount call */ - #define MS_I_VERSION (1<<23) /* Update inode I_version field */ - #define MS_STRICTATIME (1<<24) /* Always perform atime updates */ -+#define MS_TAGGED (1<<25) /* use generic inode tagging */ -+#define MS_TAGID (1<<26) /* use specific tag for this mount */ -+#define MS_NOTAGCHECK (1<<27) /* don't check tags */ - #define MS_NOSEC (1<<28) - #define MS_BORN (1<<29) - #define MS_ACTIVE (1<<30) -@@ -189,11 +192,14 @@ struct inodes_stat_t { - #define FS_EXTENT_FL 0x00080000 /* Extents */ - #define FS_DIRECTIO_FL 0x00100000 /* Use direct i/o */ - #define FS_NOCOW_FL 0x00800000 /* Do not cow file */ -+#define FS_IXUNLINK_FL 0x08000000 /* Immutable invert on unlink */ - #define FS_RESERVED_FL 0x80000000 /* reserved for ext2 lib */ - --#define FS_FL_USER_VISIBLE 0x0003DFFF /* User visible flags */ --#define FS_FL_USER_MODIFIABLE 0x000380FF /* User modifiable flags */ -- -+#define FS_BARRIER_FL 0x04000000 /* Barrier for chroot() */ -+#define FS_COW_FL 0x20000000 /* Copy on Write marker */ ++#define VCMD_tag_migrate VC_CMD(TAGMIG, 1, 0) + -+#define FS_FL_USER_VISIBLE 0x0103DFFF /* User visible flags */ -+#define FS_FL_USER_MODIFIABLE 0x010380FF /* User modifiable flags */ - - #define SYNC_FILE_RANGE_WAIT_BEFORE 1 - #define SYNC_FILE_RANGE_WRITE 2 -diff -NurpP --minimal linux-3.7/include/uapi/linux/gfs2_ondisk.h linux-3.7-vs2.3.5.1/include/uapi/linux/gfs2_ondisk.h ---- linux-3.7/include/uapi/linux/gfs2_ondisk.h 2012-12-11 15:47:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/uapi/linux/gfs2_ondisk.h 2012-12-11 21:58:36.000000000 +0000 -@@ -225,6 +225,9 @@ enum { - gfs2fl_Sync = 8, - gfs2fl_System = 9, - gfs2fl_TopLevel = 10, -+ gfs2fl_IXUnlink = 16, -+ gfs2fl_Barrier = 17, -+ gfs2fl_Cow = 18, - gfs2fl_TruncInProg = 29, - gfs2fl_InheritDirectio = 30, - gfs2fl_InheritJdata = 31, -@@ -242,6 +245,9 @@ enum { - #define GFS2_DIF_SYNC 0x00000100 - #define GFS2_DIF_SYSTEM 0x00000200 /* New in gfs2 */ - #define GFS2_DIF_TOPDIR 0x00000400 /* New in gfs2 */ -+#define GFS2_DIF_IXUNLINK 0x00010000 -+#define GFS2_DIF_BARRIER 0x00020000 -+#define GFS2_DIF_COW 0x00040000 - #define GFS2_DIF_TRUNC_IN_PROG 0x20000000 /* New in gfs2 */ - #define GFS2_DIF_INHERIT_DIRECTIO 0x40000000 /* only in gfs1 */ - #define GFS2_DIF_INHERIT_JDATA 0x80000000 -diff -NurpP --minimal linux-3.7/include/uapi/linux/if_tun.h linux-3.7-vs2.3.5.1/include/uapi/linux/if_tun.h ---- linux-3.7/include/uapi/linux/if_tun.h 2012-12-11 15:47:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/uapi/linux/if_tun.h 2012-12-11 16:11:03.000000000 +0000 -@@ -53,6 +53,7 @@ - #define TUNDETACHFILTER _IOW('T', 214, struct sock_fprog) - #define TUNGETVNETHDRSZ _IOR('T', 215, int) - #define TUNSETVNETHDRSZ _IOW('T', 216, int) -+#define TUNSETNID _IOW('T', 217, int) - - /* TUNSETIFF ifr flags */ - #define IFF_TUN 0x0001 -diff -NurpP --minimal linux-3.7/include/uapi/linux/major.h linux-3.7-vs2.3.5.1/include/uapi/linux/major.h ---- linux-3.7/include/uapi/linux/major.h 2012-12-11 15:47:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/uapi/linux/major.h 2012-12-11 22:10:37.000000000 +0000 -@@ -15,6 +15,7 @@ - #define HD_MAJOR IDE0_MAJOR - #define PTY_SLAVE_MAJOR 3 - #define TTY_MAJOR 4 -+#define VROOT_MAJOR 4 - #define TTYAUX_MAJOR 5 - #define LP_MAJOR 6 - #define VCS_MAJOR 7 -diff -NurpP --minimal linux-3.7/include/uapi/linux/nfs_mount.h linux-3.7-vs2.3.5.1/include/uapi/linux/nfs_mount.h ---- linux-3.7/include/uapi/linux/nfs_mount.h 2012-12-11 15:47:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/uapi/linux/nfs_mount.h 2012-12-11 22:05:39.000000000 +0000 -@@ -63,7 +63,8 @@ struct nfs_mount_data { - #define NFS_MOUNT_SECFLAVOUR 0x2000 /* 5 */ - #define NFS_MOUNT_NORDIRPLUS 0x4000 /* 5 */ - #define NFS_MOUNT_UNSHARED 0x8000 /* 5 */ --#define NFS_MOUNT_FLAGMASK 0xFFFF -+#define NFS_MOUNT_TAGGED 0x10000 /* context tagging */ -+#define NFS_MOUNT_FLAGMASK 0x1FFFF - - /* The following are for internal use only */ - #define NFS_MOUNT_LOOKUP_CACHE_NONEG 0x10000 -diff -NurpP --minimal linux-3.7/include/uapi/linux/reboot.h linux-3.7-vs2.3.5.1/include/uapi/linux/reboot.h ---- linux-3.7/include/uapi/linux/reboot.h 2012-12-11 15:47:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/uapi/linux/reboot.h 2012-12-11 16:29:23.000000000 +0000 -@@ -33,7 +33,7 @@ - #define LINUX_REBOOT_CMD_RESTART2 0xA1B2C3D4 - #define LINUX_REBOOT_CMD_SW_SUSPEND 0xD000FCE2 - #define LINUX_REBOOT_CMD_KEXEC 0x45584543 -- -+#define LINUX_REBOOT_CMD_OOM 0xDEADBEEF - - - #endif /* _UAPI_LINUX_REBOOT_H */ -diff -NurpP --minimal linux-3.7/include/uapi/linux/sysctl.h linux-3.7-vs2.3.5.1/include/uapi/linux/sysctl.h ---- linux-3.7/include/uapi/linux/sysctl.h 2012-12-11 15:47:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/include/uapi/linux/sysctl.h 2012-12-11 16:42:05.000000000 +0000 -@@ -60,6 +60,7 @@ enum - CTL_ABI=9, /* Binary emulation */ - CTL_CPU=10, /* CPU stuff (speed scaling, etc) */ - CTL_ARLAN=254, /* arlan wireless driver */ -+ CTL_VSERVER=4242, /* Linux-VServer debug */ - CTL_S390DBF=5677, /* s390 debug */ - CTL_SUNRPC=7249, /* sunrpc debug */ - CTL_PM=9899, /* frv power management */ -@@ -94,6 +95,7 @@ enum - - KERN_PANIC=15, /* int: panic timeout */ - KERN_REALROOTDEV=16, /* real root device to mount after initrd */ -+ KERN_VSHELPER=17, /* string: path to vshelper policy agent */ - - KERN_SPARC_REBOOT=21, /* reboot command on Sparc */ - KERN_CTLALTDEL=22, /* int: allow ctl-alt-del to reboot */ -diff -NurpP --minimal linux-3.7/init/Kconfig linux-3.7-vs2.3.5.1/init/Kconfig ---- linux-3.7/init/Kconfig 2012-12-11 15:47:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/init/Kconfig 2012-12-11 23:14:38.000000000 +0000 -@@ -699,6 +699,7 @@ config HAVE_UNSTABLE_SCHED_CLOCK ++#endif /* _UAPI_VS_TAG_CMD_H */ +diff -urNp -x '*.orig' linux-4.9/init/Kconfig linux-4.9/init/Kconfig +--- linux-4.9/init/Kconfig 2021-02-24 15:47:32.454014219 +0100 ++++ linux-4.9/init/Kconfig 2021-02-24 15:47:45.107743409 +0100 +@@ -959,6 +959,7 @@ config NUMA_BALANCING_DEFAULT_ENABLED menuconfig CGROUPS - boolean "Control Group support" - depends on EVENTFD + bool "Control Group support" + select KERNFS + default y help This option adds support for grouping sets of processes together, for use with process control subsystems such as Cpusets, CFS, memory -@@ -964,6 +965,7 @@ config USER_NS - bool "User namespace (EXPERIMENTAL)" - depends on EXPERIMENTAL - depends on UIDGID_CONVERTED -+ depends on VSERVER_DISABLED - select UIDGID_STRICT_TYPE_CHECKS - - default n -diff -NurpP --minimal linux-3.7/init/main.c linux-3.7-vs2.3.5.1/init/main.c ---- linux-3.7/init/main.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/init/main.c 2012-12-11 16:56:16.000000000 +0000 -@@ -70,6 +70,7 @@ - #include - #include - #include +diff -urNp -x '*.orig' linux-4.9/init/main.c linux-4.9/init/main.c +--- linux-4.9/init/main.c 2021-02-24 15:47:32.454014219 +0100 ++++ linux-4.9/init/main.c 2021-02-24 15:47:45.107743409 +0100 +@@ -82,6 +82,7 @@ + #include + #include + #include +#include #include #include -diff -NurpP --minimal linux-3.7/ipc/mqueue.c linux-3.7-vs2.3.5.1/ipc/mqueue.c ---- linux-3.7/ipc/mqueue.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/ipc/mqueue.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/ipc/mqueue.c linux-4.9/ipc/mqueue.c +--- linux-4.9/ipc/mqueue.c 2021-02-24 15:47:32.454014219 +0100 ++++ linux-4.9/ipc/mqueue.c 2021-02-24 15:47:45.107743409 +0100 @@ -35,6 +35,8 @@ #include #include @@ -13767,15 +12672,15 @@ diff -NurpP --minimal linux-3.7/ipc/mqueue.c linux-3.7-vs2.3.5.1/ipc/mqueue.c #include #include "util.h" -@@ -76,6 +78,7 @@ struct mqueue_inode_info { - struct pid* notify_owner; +@@ -75,6 +77,7 @@ struct mqueue_inode_info { + struct pid *notify_owner; struct user_namespace *notify_user_ns; struct user_struct *user; /* user who created, for accounting */ + struct vx_info *vxi; struct sock *notify_sock; struct sk_buff *notify_cookie; -@@ -234,6 +237,7 @@ static struct inode *mqueue_get_inode(st +@@ -230,6 +233,7 @@ static struct inode *mqueue_get_inode(st if (S_ISREG(mode)) { struct mqueue_inode_info *info; unsigned long mq_bytes, mq_treesize; @@ -13783,7 +12688,7 @@ diff -NurpP --minimal linux-3.7/ipc/mqueue.c linux-3.7-vs2.3.5.1/ipc/mqueue.c inode->i_fop = &mqueue_file_operations; inode->i_size = FILENT_SIZE; -@@ -247,6 +251,7 @@ static struct inode *mqueue_get_inode(st +@@ -243,6 +247,7 @@ static struct inode *mqueue_get_inode(st info->notify_user_ns = NULL; info->qsize = 0; info->user = NULL; /* set when all is ok */ @@ -13791,7 +12696,7 @@ diff -NurpP --minimal linux-3.7/ipc/mqueue.c linux-3.7-vs2.3.5.1/ipc/mqueue.c info->msg_tree = RB_ROOT; info->node_cache = NULL; memset(&info->attr, 0, sizeof(info->attr)); -@@ -280,17 +285,20 @@ static struct inode *mqueue_get_inode(st +@@ -276,17 +281,20 @@ static struct inode *mqueue_get_inode(st spin_lock(&mq_lock); if (u->mq_bytes + mq_bytes < u->mq_bytes || @@ -13813,19 +12718,23 @@ diff -NurpP --minimal linux-3.7/ipc/mqueue.c linux-3.7-vs2.3.5.1/ipc/mqueue.c } else if (S_ISDIR(mode)) { inc_nlink(inode); /* Some things misbehave if size == 0 on a directory */ -@@ -394,8 +402,11 @@ static void mqueue_evict_inode(struct in +@@ -393,6 +401,7 @@ static void mqueue_evict_inode(struct in user = info->user; if (user) { + struct vx_info *vxi = info->vxi; -+ + unsigned long mq_bytes, mq_treesize; + + /* Total amount of bytes accounted for the mqueue */ +@@ -405,6 +414,7 @@ static void mqueue_evict_inode(struct in + spin_lock(&mq_lock); user->mq_bytes -= mq_bytes; + vx_ipcmsg_sub(vxi, user, mq_bytes); /* * get_ns_from_inode() ensures that the * (ipc_ns = sb->s_fs_info) is either a valid ipc_ns -@@ -405,6 +416,7 @@ static void mqueue_evict_inode(struct in +@@ -414,6 +424,7 @@ static void mqueue_evict_inode(struct in if (ipc_ns) ipc_ns->mq_queues_count--; spin_unlock(&mq_lock); @@ -13833,9 +12742,9 @@ diff -NurpP --minimal linux-3.7/ipc/mqueue.c linux-3.7-vs2.3.5.1/ipc/mqueue.c free_uid(user); } if (ipc_ns) -diff -NurpP --minimal linux-3.7/ipc/msg.c linux-3.7-vs2.3.5.1/ipc/msg.c ---- linux-3.7/ipc/msg.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/ipc/msg.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/ipc/msg.c linux-4.9/ipc/msg.c +--- linux-4.9/ipc/msg.c 2021-02-24 15:47:32.454014219 +0100 ++++ linux-4.9/ipc/msg.c 2021-02-24 15:47:45.107743409 +0100 @@ -37,6 +37,7 @@ #include #include @@ -13843,8 +12752,8 @@ diff -NurpP --minimal linux-3.7/ipc/msg.c linux-3.7-vs2.3.5.1/ipc/msg.c +#include #include - #include -@@ -190,6 +191,7 @@ static int newque(struct ipc_namespace * + #include +@@ -124,6 +125,7 @@ static int newque(struct ipc_namespace * msq->q_perm.mode = msgflg & S_IRWXUGO; msq->q_perm.key = key; @@ -13852,63 +12761,46 @@ diff -NurpP --minimal linux-3.7/ipc/msg.c linux-3.7-vs2.3.5.1/ipc/msg.c msq->q_perm.security = NULL; retval = security_msg_queue_alloc(msq); -diff -NurpP --minimal linux-3.7/ipc/namespace.c linux-3.7-vs2.3.5.1/ipc/namespace.c ---- linux-3.7/ipc/namespace.c 2012-07-22 21:39:46.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/ipc/namespace.c 2012-12-11 15:56:32.000000000 +0000 -@@ -13,11 +13,12 @@ +diff -urNp -x '*.orig' linux-4.9/ipc/namespace.c linux-4.9/ipc/namespace.c +--- linux-4.9/ipc/namespace.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/ipc/namespace.c 2021-02-24 15:47:45.107743409 +0100 +@@ -13,6 +13,7 @@ #include #include - #include -+#include + #include +#include #include "util.h" --static struct ipc_namespace *create_ipc_ns(struct task_struct *tsk, -- struct ipc_namespace *old_ns) -+static struct ipc_namespace *create_ipc_ns(struct user_namespace *user_ns) - { - struct ipc_namespace *ns; - int err; -@@ -46,19 +47,19 @@ static struct ipc_namespace *create_ipc_ - ipcns_notify(IPCNS_CREATED); - register_ipcns_notifier(ns); - -- ns->user_ns = get_user_ns(task_cred_xxx(tsk, user_ns)); -+ // ns->user_ns = get_user_ns(task_cred_xxx(tsk, user_ns)); -+ ns->user_ns = get_user_ns(user_ns); +@@ -59,6 +60,7 @@ static struct ipc_namespace *create_ipc_ + sem_init_ns(ns); + msg_init_ns(ns); + shm_init_ns(ns); ++ atomic_inc(&vs_global_ipc_ns); return ns; - } - struct ipc_namespace *copy_ipcs(unsigned long flags, -- struct task_struct *tsk) -+ struct ipc_namespace *old_ns, -+ struct user_namespace *user_ns) - { -- struct ipc_namespace *ns = tsk->nsproxy->ipc_ns; -- - if (!(flags & CLONE_NEWIPC)) -- return get_ipc_ns(ns); -- return create_ipc_ns(tsk, ns); -+ return get_ipc_ns(old_ns); -+ return create_ipc_ns(user_ns); +@@ -121,6 +123,7 @@ static void free_ipc_ns(struct ipc_names + dec_ipc_namespaces(ns->ucounts); + put_user_ns(ns->user_ns); + ns_free_inum(&ns->ns); ++ atomic_dec(&vs_global_ipc_ns); + kfree(ns); } - /* -diff -NurpP --minimal linux-3.7/ipc/sem.c linux-3.7-vs2.3.5.1/ipc/sem.c ---- linux-3.7/ipc/sem.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/ipc/sem.c 2012-12-11 15:56:32.000000000 +0000 -@@ -86,6 +86,8 @@ +diff -urNp -x '*.orig' linux-4.9/ipc/sem.c linux-4.9/ipc/sem.c +--- linux-4.9/ipc/sem.c 2021-02-24 15:47:32.454014219 +0100 ++++ linux-4.9/ipc/sem.c 2021-02-24 15:47:45.107743409 +0100 +@@ -85,6 +85,8 @@ #include #include #include +#include +#include - #include + #include #include "util.h" -@@ -306,6 +308,7 @@ static int newary(struct ipc_namespace * +@@ -537,6 +539,7 @@ static int newary(struct ipc_namespace * sma->sem_perm.mode = (semflg & S_IRWXUGO); sma->sem_perm.key = key; @@ -13916,7 +12808,7 @@ diff -NurpP --minimal linux-3.7/ipc/sem.c linux-3.7-vs2.3.5.1/ipc/sem.c sma->sem_perm.security = NULL; retval = security_sem_alloc(sma); -@@ -321,6 +324,9 @@ static int newary(struct ipc_namespace * +@@ -567,6 +570,9 @@ static int newary(struct ipc_namespace * return id; } ns->used_sems += nsems; @@ -13924,54 +12816,56 @@ diff -NurpP --minimal linux-3.7/ipc/sem.c linux-3.7-vs2.3.5.1/ipc/sem.c + vx_semary_inc(sma); + vx_nsems_add(sma, nsems); - sma->sem_base = (struct sem *) &sma[1]; - -@@ -770,6 +776,9 @@ static void freeary(struct ipc_namespace + sem_unlock(sma, -1); + rcu_read_unlock(); +@@ -1155,6 +1161,9 @@ static void freeary(struct ipc_namespace wake_up_sem_queue_do(&tasks); ns->used_sems -= sma->sem_nsems; + /* FIXME: obsoleted? */ + vx_nsems_sub(sma, sma->sem_nsems); + vx_semary_dec(sma); - security_sem_free(sma); - ipc_rcu_putref(sma); + ipc_rcu_putref(sma, sem_rcu_free); } -diff -NurpP --minimal linux-3.7/ipc/shm.c linux-3.7-vs2.3.5.1/ipc/shm.c ---- linux-3.7/ipc/shm.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/ipc/shm.c 2012-12-11 15:56:32.000000000 +0000 -@@ -39,6 +39,8 @@ + +diff -urNp -x '*.orig' linux-4.9/ipc/shm.c linux-4.9/ipc/shm.c +--- linux-4.9/ipc/shm.c 2021-02-24 15:47:32.454014219 +0100 ++++ linux-4.9/ipc/shm.c 2021-02-24 15:47:45.107743409 +0100 +@@ -42,6 +42,8 @@ #include #include #include +#include +#include - #include + #include -@@ -187,7 +189,12 @@ static void shm_open(struct vm_area_stru - */ +@@ -234,10 +236,14 @@ static void shm_open(struct vm_area_stru static void shm_destroy(struct ipc_namespace *ns, struct shmid_kernel *shp) { -- ns->shm_tot -= (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT; + struct file *shm_file; + struct vx_info *vxi = lookup_vx_info(shp->shm_perm.xid); + int numpages = (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT; -+ + + shm_file = shp->shm_file; + shp->shm_file = NULL; +- ns->shm_tot -= (shp->shm_segsz + PAGE_SIZE - 1) >> PAGE_SHIFT; + vx_ipcshm_sub(vxi, shp, numpages); + ns->shm_tot -= numpages; + shm_rmid(ns, shp); shm_unlock(shp); - if (!is_file_hugepages(shp->shm_file)) -@@ -197,6 +204,7 @@ static void shm_destroy(struct ipc_names - shp->mlock_user); - fput (shp->shm_file); - security_shm_free(shp); + if (!is_file_hugepages(shm_file)) +@@ -246,6 +252,7 @@ static void shm_destroy(struct ipc_names + user_shm_unlock(i_size_read(file_inode(shm_file)), + shp->mlock_user); + fput(shm_file); + put_vx_info(vxi); - ipc_rcu_putref(shp); + ipc_rcu_putref(shp, shm_rcu_free); } -@@ -474,11 +482,15 @@ static int newseg(struct ipc_namespace * - if (ns->shm_tot + numpages > ns->shm_ctlall) +@@ -559,11 +566,15 @@ static int newseg(struct ipc_namespace * + ns->shm_tot + numpages > ns->shm_ctlall) return -ENOSPC; + if (!vx_ipcshm_avail(current_vx_info(), numpages)) @@ -13986,41 +12880,41 @@ diff -NurpP --minimal linux-3.7/ipc/shm.c linux-3.7-vs2.3.5.1/ipc/shm.c shp->shm_perm.mode = (shmflg & S_IRWXUGO); shp->mlock_user = NULL; -@@ -533,6 +545,7 @@ static int newseg(struct ipc_namespace * - ns->shm_tot += numpages; - error = shp->shm_perm.id; - shm_unlock(shp); +@@ -634,6 +645,7 @@ static int newseg(struct ipc_namespace * + + ipc_unlock_object(&shp->shm_perm); + rcu_read_unlock(); + vx_ipcshm_add(current_vx_info(), key, numpages); return error; no_id: -diff -NurpP --minimal linux-3.7/kernel/Makefile linux-3.7-vs2.3.5.1/kernel/Makefile ---- linux-3.7/kernel/Makefile 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/Makefile 2012-12-11 15:56:32.000000000 +0000 -@@ -24,6 +24,7 @@ endif - - obj-y += sched/ - obj-y += power/ +diff -urNp -x '*.orig' linux-4.9/kernel/Makefile linux-4.9/kernel/Makefile +--- linux-4.9/kernel/Makefile 2021-02-24 15:47:32.454014219 +0100 ++++ linux-4.9/kernel/Makefile 2021-02-24 15:47:45.111076846 +0100 +@@ -40,6 +40,7 @@ obj-y += printk/ + obj-y += irq/ + obj-y += rcu/ + obj-y += livepatch/ +obj-y += vserver/ - ifeq ($(CONFIG_CHECKPOINT_RESTORE),y) - obj-$(CONFIG_X86) += kcmp.o -diff -NurpP --minimal linux-3.7/kernel/auditsc.c linux-3.7-vs2.3.5.1/kernel/auditsc.c ---- linux-3.7/kernel/auditsc.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/auditsc.c 2012-12-11 15:56:32.000000000 +0000 -@@ -2372,7 +2372,7 @@ int audit_set_loginuid(kuid_t loginuid) - if (uid_valid(task->loginuid)) + obj-$(CONFIG_CHECKPOINT_RESTORE) += kcmp.o + obj-$(CONFIG_FREEZER) += freezer.o +diff -urNp -x '*.orig' linux-4.9/kernel/auditsc.c linux-4.9/kernel/auditsc.c +--- linux-4.9/kernel/auditsc.c 2021-02-24 15:47:32.457347657 +0100 ++++ linux-4.9/kernel/auditsc.c 2021-02-24 15:47:45.107743409 +0100 +@@ -1967,7 +1967,7 @@ static int audit_set_loginuid_perm(kuid_ + if (is_audit_feature_set(AUDIT_FEATURE_LOGINUID_IMMUTABLE)) return -EPERM; - #else /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */ + /* it is set, you need permission */ - if (!capable(CAP_AUDIT_CONTROL)) + if (!vx_capable(CAP_AUDIT_CONTROL, VXC_AUDIT_CONTROL)) return -EPERM; - #endif /* CONFIG_AUDIT_LOGINUID_IMMUTABLE */ - -diff -NurpP --minimal linux-3.7/kernel/capability.c linux-3.7-vs2.3.5.1/kernel/capability.c ---- linux-3.7/kernel/capability.c 2012-07-22 21:39:46.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/capability.c 2012-12-11 15:56:32.000000000 +0000 -@@ -15,6 +15,7 @@ + /* reject if this is not an unset and we don't allow that */ + if (is_audit_feature_set(AUDIT_FEATURE_ONLY_UNSET_LOGINUID) && uid_valid(loginuid)) +diff -urNp -x '*.orig' linux-4.9/kernel/capability.c linux-4.9/kernel/capability.c +--- linux-4.9/kernel/capability.c 2021-02-24 15:47:32.460681095 +0100 ++++ linux-4.9/kernel/capability.c 2021-02-24 15:47:45.111076846 +0100 +@@ -17,6 +17,7 @@ #include #include #include @@ -14028,7 +12922,7 @@ diff -NurpP --minimal linux-3.7/kernel/capability.c linux-3.7-vs2.3.5.1/kernel/c #include /* -@@ -116,6 +117,7 @@ static int cap_validate_magic(cap_user_h +@@ -107,6 +108,7 @@ static int cap_validate_magic(cap_user_h return 0; } @@ -14036,7 +12930,7 @@ diff -NurpP --minimal linux-3.7/kernel/capability.c linux-3.7-vs2.3.5.1/kernel/c /* * The only thing that can change the capabilities of the current * process is the current process. As such, we can't be in this code -@@ -349,6 +351,8 @@ bool has_ns_capability_noaudit(struct ta +@@ -344,6 +346,8 @@ bool has_ns_capability_noaudit(struct ta return (ret == 0); } @@ -14045,9 +12939,9 @@ diff -NurpP --minimal linux-3.7/kernel/capability.c linux-3.7-vs2.3.5.1/kernel/c /** * has_capability_noaudit - Does a task have a capability (unaudited) in the * initial user ns -diff -NurpP --minimal linux-3.7/kernel/compat.c linux-3.7-vs2.3.5.1/kernel/compat.c ---- linux-3.7/kernel/compat.c 2012-07-22 21:39:46.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/compat.c 2012-12-11 21:24:51.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/kernel/compat.c linux-4.9/kernel/compat.c +--- linux-4.9/kernel/compat.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/kernel/compat.c 2021-02-24 15:47:45.111076846 +0100 @@ -27,6 +27,7 @@ #include #include @@ -14056,7 +12950,7 @@ diff -NurpP --minimal linux-3.7/kernel/compat.c linux-3.7-vs2.3.5.1/kernel/compa #include -@@ -1054,7 +1055,7 @@ asmlinkage long compat_sys_stime(compat_ +@@ -1059,7 +1060,7 @@ COMPAT_SYSCALL_DEFINE1(stime, compat_tim if (err) return err; @@ -14065,11 +12959,11 @@ diff -NurpP --minimal linux-3.7/kernel/compat.c linux-3.7-vs2.3.5.1/kernel/compa return 0; } -diff -NurpP --minimal linux-3.7/kernel/cred.c linux-3.7-vs2.3.5.1/kernel/cred.c ---- linux-3.7/kernel/cred.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/cred.c 2012-12-11 15:56:32.000000000 +0000 -@@ -70,31 +70,6 @@ struct cred init_cred = { - #endif +diff -urNp -x '*.orig' linux-4.9/kernel/cred.c linux-4.9/kernel/cred.c +--- linux-4.9/kernel/cred.c 2021-02-24 15:47:32.460681095 +0100 ++++ linux-4.9/kernel/cred.c 2021-02-24 15:47:45.111076846 +0100 +@@ -64,31 +64,6 @@ struct cred init_cred = { + .group_info = &init_groups, }; -static inline void set_cred_subscribers(struct cred *cred, int n) @@ -14098,9 +12992,9 @@ diff -NurpP --minimal linux-3.7/kernel/cred.c linux-3.7-vs2.3.5.1/kernel/cred.c -} - /* - * Dispose of the shared task group credentials + * The RCU callback to actually dispose of a set of credentials */ -@@ -284,21 +259,16 @@ error: +@@ -243,21 +218,16 @@ error: * * Call commit_creds() or abort_creds() to clean up. */ @@ -14122,8 +13016,8 @@ diff -NurpP --minimal linux-3.7/kernel/cred.c linux-3.7-vs2.3.5.1/kernel/cred.c - old = task->cred; memcpy(new, old, sizeof(struct cred)); - atomic_set(&new->usage, 1); -@@ -326,6 +296,13 @@ error: + new->non_rcu = 0; +@@ -287,6 +257,13 @@ error: abort_creds(new); return NULL; } @@ -14137,9 +13031,9 @@ diff -NurpP --minimal linux-3.7/kernel/cred.c linux-3.7-vs2.3.5.1/kernel/cred.c EXPORT_SYMBOL(prepare_creds); /* -diff -NurpP --minimal linux-3.7/kernel/exit.c linux-3.7-vs2.3.5.1/kernel/exit.c ---- linux-3.7/kernel/exit.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/exit.c 2012-12-11 15:56:32.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/kernel/exit.c linux-4.9/kernel/exit.c +--- linux-4.9/kernel/exit.c 2021-02-24 15:47:32.467347970 +0100 ++++ linux-4.9/kernel/exit.c 2021-02-24 15:47:45.111076846 +0100 @@ -48,6 +48,10 @@ #include #include @@ -14151,154 +13045,131 @@ diff -NurpP --minimal linux-3.7/kernel/exit.c linux-3.7-vs2.3.5.1/kernel/exit.c #include #include #include -@@ -616,15 +620,25 @@ static struct task_struct *find_new_reap - __acquires(&tasklist_lock) +@@ -535,15 +539,25 @@ static struct task_struct *find_child_re { struct pid_namespace *pid_ns = task_active_pid_ns(father); -- struct task_struct *thread; + struct task_struct *reaper = pid_ns->child_reaper; + struct vx_info *vxi = task_get_vx_info(father); -+ struct task_struct *thread = father; -+ struct task_struct *reaper; + struct task_struct *p, *n; -- thread = father; - while_each_thread(father, thread) { - if (thread->flags & PF_EXITING) - continue; - if (unlikely(pid_ns->child_reaper == father)) - pid_ns->child_reaper = thread; -- return thread; -+ reaper = thread; -+ goto out_put; -+ } -+ -+ reaper = pid_ns->child_reaper; + if (vxi) { + BUG_ON(!vxi->vx_reaper); + if (vxi->vx_reaper != init_pid_ns.child_reaper && -+ vxi->vx_reaper != father) ++ vxi->vx_reaper != father) { + reaper = vxi->vx_reaper; - } ++ goto out_put; ++ } ++ } ++ + if (likely(reaper != father)) +- return reaper; ++ goto out_put; - if (unlikely(pid_ns->child_reaper == father)) { -@@ -662,7 +676,9 @@ static struct task_struct *find_new_reap - } + reaper = find_alive_thread(father); + if (reaper) { + pid_ns->child_reaper = reaper; +- return reaper; ++ goto out_put; } -- return pid_ns->child_reaper; + write_unlock_irq(&tasklist_lock); +@@ -560,7 +574,10 @@ static struct task_struct *find_child_re + zap_pid_ns_processes(pid_ns); + write_lock_irq(&tasklist_lock); + +- return father; ++ reaper = father; +out_put: + put_vx_info(vxi); + return reaper; } /* -@@ -713,10 +729,15 @@ static void forget_original_parent(struc - list_for_each_entry_safe(p, n, &father->children, sibling) { - struct task_struct *t = p; - do { +@@ -648,9 +665,13 @@ static void forget_original_parent(struc + return; + + reaper = find_new_reaper(father, reaper); +- list_for_each_entry(p, &father->children, sibling) { ++ for (p = list_first_entry(&father->children, struct task_struct, sibling); ++ &p->sibling != &father->children; ) { ++ struct task_struct *next, *this_reaper = reaper; ++ if (p == reaper) ++ this_reaper = task_active_pid_ns(reaper)->child_reaper; + for_each_thread(p, t) { - t->real_parent = reaper; -+ struct task_struct *new_parent = reaper; -+ -+ if (unlikely(p == reaper)) -+ new_parent = task_active_pid_ns(p)->child_reaper; -+ -+ t->real_parent = new_parent; - if (t->parent == father) { - BUG_ON(t->ptrace); -- t->parent = t->real_parent; -+ t->parent = new_parent; - } - if (t->pdeath_signal) - group_send_sig_info(t->pdeath_signal, -@@ -923,6 +944,9 @@ void do_exit(long code) ++ t->real_parent = this_reaper; + BUG_ON((!t->ptrace) != (t->parent == father)); + if (likely(!t->ptrace)) + t->parent = t->real_parent; +@@ -662,10 +683,13 @@ static void forget_original_parent(struc + * If this is a threaded reparent there is no need to + * notify anyone anything has happened. + */ +- if (!same_thread_group(reaper, father)) ++ if (!same_thread_group(this_reaper, father)) + reparent_leader(father, p, dead); ++ next = list_next_entry(p, sibling); ++ list_add(&p->sibling, &this_reaper->children); ++ p = next; + } +- list_splice_tail_init(&father->children, &reaper->children); ++ INIT_LIST_HEAD(&father->children); + } + + /* +@@ -843,6 +867,9 @@ void __noreturn do_exit(long code) */ - ptrace_put_breakpoints(tsk); + flush_ptrace_hw_breakpoint(tsk); + /* needs to stay before exit_notify() */ + exit_vx_info_early(tsk, code); + - exit_notify(tsk, group_dead); - #ifdef CONFIG_NUMA - task_lock(tsk); -@@ -976,10 +1000,15 @@ void do_exit(long code) - smp_mb(); - raw_spin_unlock_wait(&tsk->pi_lock); + TASKS_RCU(preempt_disable()); + TASKS_RCU(tasks_rcu_i = __srcu_read_lock(&tasks_rcu_exit_srcu)); + TASKS_RCU(preempt_enable()); +@@ -869,6 +896,10 @@ void __noreturn do_exit(long code) -+ /* needs to stay after exit_notify() */ + validate_creds_for_do_exit(tsk); + ++ /* needs to stay after exit_notify() and before preempt_disable() */ + exit_vx_info(tsk, code); + exit_nx_info(tsk); + - /* causes final put_task_struct in finish_task_switch(). */ - tsk->state = TASK_DEAD; - tsk->flags |= PF_NOFREEZE; /* tell freezer to ignore us */ - schedule(); -+ printk("bad task: %p [%lx]\n", current, current->state); - BUG(); - /* Avoid "noreturn function does return". */ - for (;;) -diff -NurpP --minimal linux-3.7/kernel/fork.c linux-3.7-vs2.3.5.1/kernel/fork.c ---- linux-3.7/kernel/fork.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/fork.c 2012-12-11 15:56:32.000000000 +0000 -@@ -70,6 +70,9 @@ - #include - #include - #include + check_stack_usage(); + preempt_disable(); + if (tsk->nr_dirtied) +diff -urNp -x '*.orig' linux-4.9/kernel/fork.c linux-4.9/kernel/fork.c +--- linux-4.9/kernel/fork.c 2021-02-24 15:47:32.467347970 +0100 ++++ linux-4.9/kernel/fork.c 2021-02-24 15:47:45.111076846 +0100 +@@ -77,6 +77,9 @@ + #include + #include + #include +#include +#include +#include #include #include -@@ -210,6 +213,8 @@ void free_task(struct task_struct *tsk) - arch_release_thread_info(tsk->stack); - free_thread_info(tsk->stack); +@@ -356,6 +359,8 @@ void free_task(struct task_struct *tsk) + WARN_ON_ONCE(atomic_read(&tsk->stack_refcount) != 0); + #endif rt_mutex_debug_task_free(tsk); + clr_vx_info(&tsk->vx_info); + clr_nx_info(&tsk->nx_info); ftrace_graph_exit_task(tsk); put_seccomp_filter(tsk); arch_release_task_struct(tsk); -@@ -545,6 +550,7 @@ static struct mm_struct *mm_init(struct - if (likely(!mm_alloc_pgd(mm))) { - mm->def_flags = 0; - mmu_notifier_mm_init(mm); -+ set_vx_info(&mm->mm_vx_info, p->vx_info); - return mm; - } - -@@ -597,6 +603,7 @@ void __mmdrop(struct mm_struct *mm) - destroy_context(mm); - mmu_notifier_mm_destroy(mm); - check_mm(mm); -+ clr_vx_info(&mm->mm_vx_info); - free_mm(mm); - } - EXPORT_SYMBOL_GPL(__mmdrop); -@@ -816,6 +823,7 @@ struct mm_struct *dup_mm(struct task_str - goto fail_nomem; - - memcpy(mm, oldmm, sizeof(*mm)); -+ mm->mm_vx_info = NULL; - mm_init_cpumask(mm); - - #ifdef CONFIG_TRANSPARENT_HUGEPAGE -@@ -854,6 +862,7 @@ fail_nocontext: - * If init_new_context() failed, we cannot use mmput() to free the mm - * because it calls destroy_context() - */ -+ clr_vx_info(&mm->mm_vx_info); - mm_free_pgd(mm); - free_mm(mm); - return NULL; -@@ -1136,6 +1145,8 @@ static struct task_struct *copy_process( +@@ -1476,6 +1481,8 @@ static __latent_entropy struct task_stru + { int retval; struct task_struct *p; - int cgroup_callbacks_done = 0; + struct vx_info *vxi; + struct nx_info *nxi; if ((clone_flags & (CLONE_NEWNS|CLONE_FS)) == (CLONE_NEWNS|CLONE_FS)) return ERR_PTR(-EINVAL); -@@ -1183,7 +1194,12 @@ static struct task_struct *copy_process( +@@ -1548,7 +1555,12 @@ static __latent_entropy struct task_stru DEBUG_LOCKS_WARN_ON(!p->hardirqs_enabled); DEBUG_LOCKS_WARN_ON(!p->softirqs_enabled); #endif @@ -14310,11 +13181,11 @@ diff -NurpP --minimal linux-3.7/kernel/fork.c linux-3.7-vs2.3.5.1/kernel/fork.c + goto bad_fork_free; if (atomic_read(&p->real_cred->user->processes) >= task_rlimit(p, RLIMIT_NPROC)) { - if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_RESOURCE) && -@@ -1458,6 +1474,18 @@ static struct task_struct *copy_process( - + if (p->real_cred->user != INIT_USER && +@@ -1843,6 +1855,18 @@ static __latent_entropy struct task_stru total_forks++; spin_unlock(¤t->sighand->siglock); + syscall_tracepoint_update(p); + + /* p is copy of current */ + vxi = p->vx_info; @@ -14328,23 +13199,23 @@ diff -NurpP --minimal linux-3.7/kernel/fork.c linux-3.7-vs2.3.5.1/kernel/fork.c + if (nxi) + claim_nx_info(nxi, p); write_unlock_irq(&tasklist_lock); + proc_fork_connector(p); - cgroup_post_fork(p); -diff -NurpP --minimal linux-3.7/kernel/kthread.c linux-3.7-vs2.3.5.1/kernel/kthread.c ---- linux-3.7/kernel/kthread.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/kthread.c 2012-12-11 17:04:03.000000000 +0000 -@@ -17,6 +17,7 @@ - #include - #include +diff -urNp -x '*.orig' linux-4.9/kernel/kthread.c linux-4.9/kernel/kthread.c +--- linux-4.9/kernel/kthread.c 2021-02-24 15:47:32.474014845 +0100 ++++ linux-4.9/kernel/kthread.c 2021-02-24 15:47:45.111076846 +0100 +@@ -19,6 +19,7 @@ #include + #include + #include +#include #include static DEFINE_SPINLOCK(kthread_create_lock); -diff -NurpP --minimal linux-3.7/kernel/nsproxy.c linux-3.7-vs2.3.5.1/kernel/nsproxy.c ---- linux-3.7/kernel/nsproxy.c 2012-01-09 15:15:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/nsproxy.c 2012-12-11 15:56:32.000000000 +0000 -@@ -20,11 +20,14 @@ +diff -urNp -x '*.orig' linux-4.9/kernel/nsproxy.c linux-4.9/kernel/nsproxy.c +--- linux-4.9/kernel/nsproxy.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/kernel/nsproxy.c 2021-02-24 15:47:45.111076846 +0100 +@@ -20,12 +20,15 @@ #include #include #include @@ -14352,14 +13223,15 @@ diff -NurpP --minimal linux-3.7/kernel/nsproxy.c linux-3.7-vs2.3.5.1/kernel/nspr +#include #include #include - #include + #include #include #include + #include +#include "../fs/mount.h" static struct kmem_cache *nsproxy_cachep; -@@ -46,8 +49,11 @@ static inline struct nsproxy *create_nsp +@@ -50,8 +53,11 @@ static inline struct nsproxy *create_nsp struct nsproxy *nsproxy; nsproxy = kmem_cache_alloc(nsproxy_cachep, GFP_KERNEL); @@ -14372,67 +13244,79 @@ diff -NurpP --minimal linux-3.7/kernel/nsproxy.c linux-3.7-vs2.3.5.1/kernel/nspr return nsproxy; } -@@ -56,8 +62,11 @@ static inline struct nsproxy *create_nsp +@@ -60,9 +66,12 @@ static inline struct nsproxy *create_nsp * Return the newly created nsproxy. Do not attach this to the task, * leave it to the caller to do proper locking and attach it to task. */ -static struct nsproxy *create_new_namespaces(unsigned long flags, -- struct task_struct *tsk, struct fs_struct *new_fs) -+static struct nsproxy *unshare_namespaces(unsigned long flags, -+ struct nsproxy *orig, -+ struct fs_struct *new_fs, -+ struct user_namespace *new_user, -+ struct pid_namespace *new_pid) +- struct task_struct *tsk, struct user_namespace *user_ns, +- struct fs_struct *new_fs) ++static struct nsproxy *unshare_namespaces( ++ unsigned long flags, ++ struct nsproxy *orig, ++ struct fs_struct *new_fs, ++ struct user_namespace *new_user, ++ struct pid_namespace *new_pid) { struct nsproxy *new_nsp; int err; -@@ -66,31 +75,31 @@ static struct nsproxy *create_new_namesp +@@ -71,39 +80,37 @@ static struct nsproxy *create_new_namesp if (!new_nsp) return ERR_PTR(-ENOMEM); -- new_nsp->mnt_ns = copy_mnt_ns(flags, tsk->nsproxy->mnt_ns, new_fs); -+ new_nsp->mnt_ns = copy_mnt_ns(flags, orig->mnt_ns, new_fs); +- new_nsp->mnt_ns = copy_mnt_ns(flags, tsk->nsproxy->mnt_ns, user_ns, new_fs); ++ new_nsp->mnt_ns = copy_mnt_ns(flags, orig->mnt_ns, new_user, new_fs); if (IS_ERR(new_nsp->mnt_ns)) { err = PTR_ERR(new_nsp->mnt_ns); goto out_ns; } -- new_nsp->uts_ns = copy_utsname(flags, tsk); -+ new_nsp->uts_ns = copy_utsname(flags, orig->uts_ns, new_user); +- new_nsp->uts_ns = copy_utsname(flags, user_ns, tsk->nsproxy->uts_ns); ++ new_nsp->uts_ns = copy_utsname(flags, new_user, orig->uts_ns); if (IS_ERR(new_nsp->uts_ns)) { err = PTR_ERR(new_nsp->uts_ns); goto out_uts; } -- new_nsp->ipc_ns = copy_ipcs(flags, tsk); -+ new_nsp->ipc_ns = copy_ipcs(flags, orig->ipc_ns, new_user); +- new_nsp->ipc_ns = copy_ipcs(flags, user_ns, tsk->nsproxy->ipc_ns); ++ new_nsp->ipc_ns = copy_ipcs(flags, new_user, orig->ipc_ns); if (IS_ERR(new_nsp->ipc_ns)) { err = PTR_ERR(new_nsp->ipc_ns); goto out_ipc; } -- new_nsp->pid_ns = copy_pid_ns(flags, task_active_pid_ns(tsk)); -+ new_nsp->pid_ns = copy_pid_ns(flags, new_pid); - if (IS_ERR(new_nsp->pid_ns)) { - err = PTR_ERR(new_nsp->pid_ns); +- new_nsp->pid_ns_for_children = +- copy_pid_ns(flags, user_ns, tsk->nsproxy->pid_ns_for_children); ++ new_nsp->pid_ns_for_children = copy_pid_ns(flags, new_user, new_pid); + if (IS_ERR(new_nsp->pid_ns_for_children)) { + err = PTR_ERR(new_nsp->pid_ns_for_children); goto out_pid; } -- new_nsp->net_ns = copy_net_ns(flags, tsk->nsproxy->net_ns); -+ new_nsp->net_ns = copy_net_ns(flags, orig->net_ns); +- new_nsp->cgroup_ns = copy_cgroup_ns(flags, user_ns, +- tsk->nsproxy->cgroup_ns); ++ new_nsp->cgroup_ns = copy_cgroup_ns(flags, new_user, orig->cgroup_ns); + if (IS_ERR(new_nsp->cgroup_ns)) { + err = PTR_ERR(new_nsp->cgroup_ns); + goto out_cgroup; + } + +- new_nsp->net_ns = copy_net_ns(flags, user_ns, tsk->nsproxy->net_ns); ++ new_nsp->net_ns = copy_net_ns(flags, new_user, orig->net_ns); if (IS_ERR(new_nsp->net_ns)) { err = PTR_ERR(new_nsp->net_ns); goto out_net; -@@ -115,6 +124,40 @@ out_ns: +@@ -130,6 +137,43 @@ out_ns: return ERR_PTR(err); } +static struct nsproxy *create_new_namespaces(unsigned long flags, -+ struct task_struct *tsk, struct fs_struct *new_fs) ++ struct task_struct *tsk, struct user_namespace *user_ns, ++ struct fs_struct *new_fs) ++ +{ + return unshare_namespaces(flags, tsk->nsproxy, -+ new_fs, task_cred_xxx(tsk, user_ns), -+ task_active_pid_ns(tsk)); ++ new_fs, user_ns, task_active_pid_ns(tsk)); +} + +/* @@ -14453,10 +13337,12 @@ diff -NurpP --minimal linux-3.7/kernel/nsproxy.c linux-3.7-vs2.3.5.1/kernel/nspr + get_uts_ns(ns->uts_ns); + if (ns->ipc_ns) + get_ipc_ns(ns->ipc_ns); -+ if (ns->pid_ns) -+ get_pid_ns(ns->pid_ns); ++ if (ns->pid_ns_for_children) ++ get_pid_ns(ns->pid_ns_for_children); + if (ns->net_ns) + get_net(ns->net_ns); ++ if (ns->cgroup_ns) ++ get_cgroup_ns(ns->cgroup_ns); + } + return ns; +} @@ -14464,52 +13350,51 @@ diff -NurpP --minimal linux-3.7/kernel/nsproxy.c linux-3.7-vs2.3.5.1/kernel/nspr /* * called from clone. This now handles copy for nsproxy and all * namespaces therein. -@@ -122,9 +165,12 @@ out_ns: - int copy_namespaces(unsigned long flags, struct task_struct *tsk) +@@ -138,7 +182,10 @@ int copy_namespaces(unsigned long flags, { struct nsproxy *old_ns = tsk->nsproxy; + struct user_namespace *user_ns = task_cred_xxx(tsk, user_ns); - struct nsproxy *new_ns; + struct nsproxy *new_ns = NULL; - int err = 0; - ++ + vxdprintk(VXD_CBIT(space, 7), "copy_namespaces(0x%08lx,%p[%p])", + flags, tsk, old_ns); -+ - if (!old_ns) - return 0; -@@ -134,7 +180,7 @@ int copy_namespaces(unsigned long flags, - CLONE_NEWPID | CLONE_NEWNET))) + if (likely(!(flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC | + CLONE_NEWPID | CLONE_NEWNET | +@@ -147,7 +194,7 @@ int copy_namespaces(unsigned long flags, return 0; - -- if (!capable(CAP_SYS_ADMIN)) { -+ if (!vx_can_unshare(CAP_SYS_ADMIN, flags)) { - err = -EPERM; - goto out; } -@@ -161,6 +207,9 @@ int copy_namespaces(unsigned long flags, - out: - put_nsproxy(old_ns); +- if (!ns_capable(user_ns, CAP_SYS_ADMIN)) ++ if (!vx_ns_can_unshare(user_ns, CAP_SYS_ADMIN, flags)) + return -EPERM; + + /* +@@ -166,6 +213,9 @@ int copy_namespaces(unsigned long flags, + return PTR_ERR(new_ns); + + tsk->nsproxy = new_ns; + vxdprintk(VXD_CBIT(space, 3), -+ "copy_namespaces(0x%08lx,%p[%p]) = %d [%p]", -+ flags, tsk, old_ns, err, new_ns); - return err; ++ "copy_namespaces(0x%08lx,%p[%p]) = [%p]", ++ flags, tsk, old_ns, new_ns); + return 0; } -@@ -174,7 +223,9 @@ void free_nsproxy(struct nsproxy *ns) +@@ -179,8 +229,10 @@ void free_nsproxy(struct nsproxy *ns) put_ipc_ns(ns->ipc_ns); - if (ns->pid_ns) - put_pid_ns(ns->pid_ns); -- put_net(ns->net_ns); + if (ns->pid_ns_for_children) + put_pid_ns(ns->pid_ns_for_children); + if (ns->net_ns) + put_net(ns->net_ns); + put_cgroup_ns(ns->cgroup_ns); +- put_net(ns->net_ns); + atomic_dec(&vs_global_nsproxy); kmem_cache_free(nsproxy_cachep, ns); } -@@ -187,11 +238,15 @@ int unshare_nsproxy_namespaces(unsigned - { +@@ -194,12 +246,16 @@ int unshare_nsproxy_namespaces(unsigned + struct user_namespace *user_ns; int err = 0; + vxdprintk(VXD_CBIT(space, 4), @@ -14517,54 +13402,55 @@ diff -NurpP --minimal linux-3.7/kernel/nsproxy.c linux-3.7-vs2.3.5.1/kernel/nspr + unshare_flags, current->nsproxy); + if (!(unshare_flags & (CLONE_NEWNS | CLONE_NEWUTS | CLONE_NEWIPC | - CLONE_NEWNET))) + CLONE_NEWNET | CLONE_NEWPID | CLONE_NEWCGROUP))) return 0; -- if (!capable(CAP_SYS_ADMIN)) -+ if (!vx_can_unshare(CAP_SYS_ADMIN, unshare_flags)) + user_ns = new_cred ? new_cred->user_ns : current_user_ns(); +- if (!ns_capable(user_ns, CAP_SYS_ADMIN)) ++ if (!vx_ns_can_unshare(user_ns, CAP_SYS_ADMIN, unshare_flags)) return -EPERM; - *new_nsp = create_new_namespaces(unshare_flags, current, -diff -NurpP --minimal linux-3.7/kernel/pid.c linux-3.7-vs2.3.5.1/kernel/pid.c ---- linux-3.7/kernel/pid.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/pid.c 2012-12-11 15:56:32.000000000 +0000 -@@ -36,6 +36,7 @@ - #include - #include + *new_nsp = create_new_namespaces(unshare_flags, current, user_ns, +diff -urNp -x '*.orig' linux-4.9/kernel/pid.c linux-4.9/kernel/pid.c +--- linux-4.9/kernel/pid.c 2021-02-24 15:47:32.477348283 +0100 ++++ linux-4.9/kernel/pid.c 2021-02-24 15:47:45.111076846 +0100 +@@ -38,6 +38,7 @@ #include + #include + #include +#include #define pid_hashfn(nr, ns) \ hash_long((unsigned long)nr + (unsigned long)ns, pidhash_shift) -@@ -344,7 +345,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns); +@@ -381,7 +382,7 @@ EXPORT_SYMBOL_GPL(find_pid_ns); struct pid *find_vpid(int nr) { -- return find_pid_ns(nr, current->nsproxy->pid_ns); -+ return find_pid_ns(vx_rmap_pid(nr), current->nsproxy->pid_ns); +- return find_pid_ns(nr, task_active_pid_ns(current)); ++ return find_pid_ns(vx_rmap_pid(nr), task_active_pid_ns(current)); } EXPORT_SYMBOL_GPL(find_vpid); -@@ -404,6 +405,9 @@ void transfer_pid(struct task_struct *ol +@@ -437,6 +438,9 @@ void transfer_pid(struct task_struct *ol struct task_struct *pid_task(struct pid *pid, enum pid_type type) { struct task_struct *result = NULL; + -+ if (type == PIDTYPE_REALPID) ++ if (type == __PIDTYPE_REALPID) + type = PIDTYPE_PID; if (pid) { struct hlist_node *first; first = rcu_dereference_check(hlist_first_rcu(&pid->tasks[type]), -@@ -423,7 +427,7 @@ struct task_struct *find_task_by_pid_ns( - rcu_lockdep_assert(rcu_read_lock_held(), - "find_task_by_pid_ns() needs rcu_read_lock()" - " protection"); +@@ -455,7 +459,7 @@ struct task_struct *find_task_by_pid_ns( + { + RCU_LOCKDEP_WARN(!rcu_read_lock_held(), + "find_task_by_pid_ns() needs rcu_read_lock() protection"); - return pid_task(find_pid_ns(nr, ns), PIDTYPE_PID); + return pid_task(find_pid_ns(vx_rmap_pid(nr), ns), PIDTYPE_PID); } struct task_struct *find_task_by_vpid(pid_t vnr) -@@ -467,7 +471,7 @@ struct pid *find_get_pid(pid_t nr) +@@ -499,7 +503,7 @@ struct pid *find_get_pid(pid_t nr) } EXPORT_SYMBOL_GPL(find_get_pid); @@ -14573,7 +13459,7 @@ diff -NurpP --minimal linux-3.7/kernel/pid.c linux-3.7-vs2.3.5.1/kernel/pid.c { struct upid *upid; pid_t nr = 0; -@@ -481,6 +485,11 @@ pid_t pid_nr_ns(struct pid *pid, struct +@@ -513,6 +517,11 @@ pid_t pid_nr_ns(struct pid *pid, struct } EXPORT_SYMBOL_GPL(pid_nr_ns); @@ -14584,95 +13470,57 @@ diff -NurpP --minimal linux-3.7/kernel/pid.c linux-3.7-vs2.3.5.1/kernel/pid.c + pid_t pid_vnr(struct pid *pid) { - return pid_nr_ns(pid, current->nsproxy->pid_ns); -diff -NurpP --minimal linux-3.7/kernel/pid_namespace.c linux-3.7-vs2.3.5.1/kernel/pid_namespace.c ---- linux-3.7/kernel/pid_namespace.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/pid_namespace.c 2012-12-11 17:04:24.000000000 +0000 -@@ -17,6 +17,7 @@ - #include + return pid_nr_ns(pid, task_active_pid_ns(current)); +diff -urNp -x '*.orig' linux-4.9/kernel/pid_namespace.c linux-4.9/kernel/pid_namespace.c +--- linux-4.9/kernel/pid_namespace.c 2021-02-24 15:47:32.477348283 +0100 ++++ linux-4.9/kernel/pid_namespace.c 2021-02-24 15:47:45.111076846 +0100 +@@ -18,6 +18,7 @@ + #include #include #include +#include - #define BITS_PER_PAGE (PAGE_SIZE*8) - -@@ -100,6 +101,7 @@ static struct pid_namespace *create_pid_ - goto out_free_map; + struct pid_cache { + int nr_ids; +@@ -124,6 +125,7 @@ static struct pid_namespace *create_pid_ + ns->ns.ops = &pidns_operations; kref_init(&ns->kref); + atomic_inc(&vs_global_pid_ns); ns->level = level; ns->parent = get_pid_ns(parent_pid_ns); - -@@ -131,6 +133,7 @@ static void destroy_pid_namespace(struct - - for (i = 0; i < PIDMAP_ENTRIES; i++) - kfree(ns->pidmap[i].page); + ns->user_ns = get_user_ns(user_ns); +@@ -142,6 +144,7 @@ static struct pid_namespace *create_pid_ + out_free_map: + kfree(ns->pidmap[0].page); + out_free: + atomic_dec(&vs_global_pid_ns); kmem_cache_free(pid_ns_cachep, ns); - } - -diff -NurpP --minimal linux-3.7/kernel/posix-timers.c linux-3.7-vs2.3.5.1/kernel/posix-timers.c ---- linux-3.7/kernel/posix-timers.c 2012-01-09 15:15:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/posix-timers.c 2012-12-11 15:56:32.000000000 +0000 -@@ -47,6 +47,7 @@ - #include - #include - #include -+#include - - /* - * Management arrays for POSIX timers. Timers are kept in slab memory -@@ -340,6 +341,7 @@ int posix_timer_event(struct k_itimer *t - { - struct task_struct *task; - int shared, ret = -1; -+ - /* - * FIXME: if ->sigq is queued we can race with - * dequeue_signal()->do_schedule_next_timer(). -@@ -356,10 +358,18 @@ int posix_timer_event(struct k_itimer *t - rcu_read_lock(); - task = pid_task(timr->it_pid, PIDTYPE_PID); - if (task) { -+ struct vx_info_save vxis; -+ struct vx_info *vxi; -+ -+ vxi = get_vx_info(task->vx_info); -+ enter_vx_info(vxi, &vxis); - shared = !(timr->it_sigev_notify & SIGEV_THREAD_ID); - ret = send_sigqueue(timr->sigq, task, shared); -+ leave_vx_info(&vxis); -+ put_vx_info(vxi); - } - rcu_read_unlock(); -+ - /* If we failed to send the signal the timer stops. */ - return ret > 0; - } -diff -NurpP --minimal linux-3.7/kernel/printk.c linux-3.7-vs2.3.5.1/kernel/printk.c ---- linux-3.7/kernel/printk.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/printk.c 2012-12-11 15:56:32.000000000 +0000 -@@ -42,6 +42,7 @@ - #include - #include - #include + out_dec: + dec_pid_namespaces(ucounts); +diff -urNp -x '*.orig' linux-4.9/kernel/printk/printk.c linux-4.9/kernel/printk/printk.c +--- linux-4.9/kernel/printk/printk.c 2021-02-24 15:47:32.480681720 +0100 ++++ linux-4.9/kernel/printk/printk.c 2021-02-24 15:47:45.114410284 +0100 +@@ -45,6 +45,7 @@ + #include + #include + #include +#include #include - -@@ -818,7 +819,7 @@ static int check_syslog_permissions(int - return 0; + #include +@@ -611,7 +612,7 @@ int check_syslog_permissions(int type, i + goto ok; if (syslog_action_restricted(type)) { - if (capable(CAP_SYSLOG)) + if (vx_capable(CAP_SYSLOG, VXC_SYSLOG)) - return 0; - /* For historical reasons, accept CAP_SYS_ADMIN too, with a warning */ - if (capable(CAP_SYS_ADMIN)) { -@@ -1111,12 +1112,9 @@ int do_syslog(int type, char __user *buf + goto ok; + /* + * For historical reasons, accept CAP_SYS_ADMIN too, with +@@ -1398,12 +1399,9 @@ int do_syslog(int type, char __user *buf if (error) - return error; + goto out; - switch (type) { - case SYSLOG_ACTION_CLOSE: /* Close log */ @@ -14686,7 +13534,7 @@ diff -NurpP --minimal linux-3.7/kernel/printk.c linux-3.7-vs2.3.5.1/kernel/print error = -EINVAL; if (!buf || len < 0) goto out; -@@ -1127,6 +1125,16 @@ int do_syslog(int type, char __user *buf +@@ -1414,6 +1412,16 @@ int do_syslog(int type, char __user *buf error = -EFAULT; goto out; } @@ -14703,7 +13551,7 @@ diff -NurpP --minimal linux-3.7/kernel/printk.c linux-3.7-vs2.3.5.1/kernel/print error = wait_event_interruptible(log_wait, syslog_seq != log_next_seq); if (error) -@@ -1139,16 +1147,6 @@ int do_syslog(int type, char __user *buf +@@ -1426,16 +1434,6 @@ int do_syslog(int type, char __user *buf /* FALL THRU */ /* Read last kernel messages */ case SYSLOG_ACTION_READ_ALL: @@ -14720,88 +13568,105 @@ diff -NurpP --minimal linux-3.7/kernel/printk.c linux-3.7-vs2.3.5.1/kernel/print error = syslog_print_all(buf, len, clear); break; /* Clear ring buffer */ -diff -NurpP --minimal linux-3.7/kernel/ptrace.c linux-3.7-vs2.3.5.1/kernel/ptrace.c ---- linux-3.7/kernel/ptrace.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/ptrace.c 2012-12-11 15:56:32.000000000 +0000 -@@ -22,6 +22,7 @@ +diff -urNp -x '*.orig' linux-4.9/kernel/ptrace.c linux-4.9/kernel/ptrace.c +--- linux-4.9/kernel/ptrace.c 2021-02-24 15:47:32.480681720 +0100 ++++ linux-4.9/kernel/ptrace.c 2021-02-24 15:47:45.114410284 +0100 +@@ -23,6 +23,7 @@ #include #include #include +#include #include #include + #include +@@ -336,6 +337,11 @@ ok: + !ptrace_has_cap(mm->user_ns, mode))) + return -EPERM; -@@ -217,6 +218,11 @@ ok: - dumpable = get_dumpable(task->mm); - if (!dumpable && !ptrace_has_cap(task_user_ns(task), mode)) - return -EPERM; + if (!vx_check(task->xid, VS_ADMIN_P|VS_WATCH_P|VS_IDENT)) + return -EPERM; + if (!vx_check(task->xid, VS_IDENT) && + !task_vx_flags(task, VXF_STATE_ADMIN, 0)) + return -EACCES; - + if (mode & PTRACE_MODE_SCHED) + return 0; return security_ptrace_access_check(task, mode); - } -diff -NurpP --minimal linux-3.7/kernel/sched/core.c linux-3.7-vs2.3.5.1/kernel/sched/core.c ---- linux-3.7/kernel/sched/core.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/sched/core.c 2012-12-11 15:56:32.000000000 +0000 -@@ -72,6 +72,8 @@ - #include - #include - #include +diff -urNp -x '*.orig' linux-4.9/kernel/reboot.c linux-4.9/kernel/reboot.c +--- linux-4.9/kernel/reboot.c 2021-02-24 15:47:32.484015158 +0100 ++++ linux-4.9/kernel/reboot.c 2021-02-24 15:47:45.114410284 +0100 +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + /* + * this indicates whether you can reboot with ctrl-alt-del: the default is yes +@@ -269,6 +270,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off); + + static DEFINE_MUTEX(reboot_mutex); + ++long vs_reboot(unsigned int, void __user *); ++ + /* + * Reboot system call: for obvious reasons only root may call it, + * and even root needs to set up some magic numbers in the registers +@@ -311,6 +314,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int + if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off) + cmd = LINUX_REBOOT_CMD_HALT; + ++ if (!vx_check(0, VS_ADMIN|VS_WATCH)) ++ return vs_reboot(cmd, arg); ++ + mutex_lock(&reboot_mutex); + switch (cmd) { + case LINUX_REBOOT_CMD_RESTART: +diff -urNp -x '*.orig' linux-4.9/kernel/sched/core.c linux-4.9/kernel/sched/core.c +--- linux-4.9/kernel/sched/core.c 2021-02-24 15:47:32.484015158 +0100 ++++ linux-4.9/kernel/sched/core.c 2021-02-24 15:47:45.114410284 +0100 +@@ -75,6 +75,8 @@ + #include + #include + #include +#include +#include #include #include -@@ -2030,9 +2032,17 @@ EXPORT_SYMBOL(avenrun); /* should be rem - */ - void get_avenrun(unsigned long *loads, unsigned long offset, int shift) - { -- loads[0] = (avenrun[0] + offset) << shift; -- loads[1] = (avenrun[1] + offset) << shift; -- loads[2] = (avenrun[2] + offset) << shift; -+ if (vx_flags(VXF_VIRT_LOAD, 0)) { -+ struct vx_info *vxi = current_vx_info(); -+ -+ loads[0] = (vxi->cvirt.load[0] + offset) << shift; -+ loads[1] = (vxi->cvirt.load[1] + offset) << shift; -+ loads[2] = (vxi->cvirt.load[2] + offset) << shift; -+ } else { -+ loads[0] = (avenrun[0] + offset) << shift; -+ loads[1] = (avenrun[1] + offset) << shift; -+ loads[2] = (avenrun[2] + offset) << shift; -+ } - } - - static long calc_load_fold_active(struct rq *this_rq) -@@ -3596,7 +3606,7 @@ SYSCALL_DEFINE1(nice, int, increment) - nice = 19; +@@ -3431,6 +3433,7 @@ void __noreturn do_task_dead(void) + __set_current_state(TASK_DEAD); + current->flags |= PF_NOFREEZE; /* tell freezer to ignore us */ + __schedule(false); ++ printk("bad task: %p [%lx]\n", current, current->state); + BUG(); + /* Avoid "noreturn function does return". */ + for (;;) +@@ -3825,7 +3828,7 @@ SYSCALL_DEFINE1(nice, int, increment) + nice = clamp_val(nice, MIN_NICE, MAX_NICE); if (increment < 0 && !can_nice(current, nice)) - return -EPERM; + return vx_flags(VXF_IGNEG_NICE, 0) ? 0 : -EPERM; retval = security_task_setnice(current, nice); if (retval) -diff -NurpP --minimal linux-3.7/kernel/sched/cputime.c linux-3.7-vs2.3.5.1/kernel/sched/cputime.c ---- linux-3.7/kernel/sched/cputime.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/sched/cputime.c 2012-12-11 21:13:27.000000000 +0000 -@@ -3,6 +3,7 @@ - #include +diff -urNp -x '*.orig' linux-4.9/kernel/sched/cputime.c linux-4.9/kernel/sched/cputime.c +--- linux-4.9/kernel/sched/cputime.c 2021-02-24 15:47:32.484015158 +0100 ++++ linux-4.9/kernel/sched/cputime.c 2021-02-24 15:47:45.114410284 +0100 +@@ -4,6 +4,7 @@ #include #include + #include +#include #include "sched.h" - - -@@ -150,14 +151,17 @@ static inline void task_group_account_fi + #ifdef CONFIG_PARAVIRT + #include +@@ -125,14 +126,17 @@ static inline void task_group_account_fi void account_user_time(struct task_struct *p, cputime_t cputime, cputime_t cputime_scaled) { + struct vx_info *vxi = p->vx_info; /* p is _always_ current */ -+ int nice = (TASK_NICE(p) > 0); ++ int nice = (task_nice(p) > 0); int index; /* Add user time to process. */ @@ -14810,12 +13675,12 @@ diff -NurpP --minimal linux-3.7/kernel/sched/cputime.c linux-3.7-vs2.3.5.1/kerne + vx_account_user(vxi, cputime, nice); account_group_user_time(p, cputime); -- index = (TASK_NICE(p) > 0) ? CPUTIME_NICE : CPUTIME_USER; +- index = (task_nice(p) > 0) ? CPUTIME_NICE : CPUTIME_USER; + index = (nice) ? CPUTIME_NICE : CPUTIME_USER; /* Add user time to cpustat. */ - task_group_account_field(p, index, (__force u64) cputime); -@@ -204,9 +208,12 @@ static inline + task_group_account_field(p, index, cputime_to_nsecs(cputime)); +@@ -179,9 +183,12 @@ static inline void __account_system_time(struct task_struct *p, cputime_t cputime, cputime_t cputime_scaled, int index) { @@ -14828,18 +13693,18 @@ diff -NurpP --minimal linux-3.7/kernel/sched/cputime.c linux-3.7-vs2.3.5.1/kerne account_group_system_time(p, cputime); /* Add system time to cpustat. */ -diff -NurpP --minimal linux-3.7/kernel/sched/fair.c linux-3.7-vs2.3.5.1/kernel/sched/fair.c ---- linux-3.7/kernel/sched/fair.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/sched/fair.c 2012-12-11 15:56:33.000000000 +0000 -@@ -26,6 +26,7 @@ - #include - #include - #include +diff -urNp -x '*.orig' linux-4.9/kernel/sched/fair.c linux-4.9/kernel/sched/fair.c +--- linux-4.9/kernel/sched/fair.c 2021-02-24 15:47:32.487348596 +0100 ++++ linux-4.9/kernel/sched/fair.c 2021-02-24 15:47:45.117743722 +0100 +@@ -30,6 +30,7 @@ + #include + #include + #include +#include #include -@@ -1111,6 +1112,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st +@@ -3431,6 +3432,8 @@ enqueue_entity(struct cfs_rq *cfs_rq, st __enqueue_entity(cfs_rq, se); se->on_rq = 1; @@ -14848,28 +13713,51 @@ diff -NurpP --minimal linux-3.7/kernel/sched/fair.c linux-3.7-vs2.3.5.1/kernel/s if (cfs_rq->nr_running == 1) { list_add_leaf_cfs_rq(cfs_rq); check_enqueue_throttle(cfs_rq); -@@ -1191,6 +1194,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st +@@ -3500,6 +3503,8 @@ dequeue_entity(struct cfs_rq *cfs_rq, st if (se != cfs_rq->curr) __dequeue_entity(cfs_rq, se); se->on_rq = 0; + if (entity_is_task(se)) + vx_deactivate_task(task_of(se)); - update_cfs_load(cfs_rq, 0); account_entity_dequeue(cfs_rq, se); -diff -NurpP --minimal linux-3.7/kernel/signal.c linux-3.7-vs2.3.5.1/kernel/signal.c ---- linux-3.7/kernel/signal.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/signal.c 2012-12-11 15:56:33.000000000 +0000 -@@ -31,6 +31,8 @@ - #include - #include - #include + /* +diff -urNp -x '*.orig' linux-4.9/kernel/sched/loadavg.c linux-4.9/kernel/sched/loadavg.c +--- linux-4.9/kernel/sched/loadavg.c 2021-02-24 15:47:32.487348596 +0100 ++++ linux-4.9/kernel/sched/loadavg.c 2021-02-24 15:47:45.117743722 +0100 +@@ -73,9 +73,16 @@ EXPORT_SYMBOL(avenrun); /* should be rem + */ + void get_avenrun(unsigned long *loads, unsigned long offset, int shift) + { +- loads[0] = (avenrun[0] + offset) << shift; +- loads[1] = (avenrun[1] + offset) << shift; +- loads[2] = (avenrun[2] + offset) << shift; ++ if (vx_flags(VXF_VIRT_LOAD, 0)) { ++ struct vx_info *vxi = current_vx_info(); ++ loads[0] = (vxi->cvirt.load[0] + offset) << shift; ++ loads[1] = (vxi->cvirt.load[1] + offset) << shift; ++ loads[2] = (vxi->cvirt.load[2] + offset) << shift; ++ } else { ++ loads[0] = (avenrun[0] + offset) << shift; ++ loads[1] = (avenrun[1] + offset) << shift; ++ loads[2] = (avenrun[2] + offset) << shift; ++ } + } + + long calc_load_fold_active(struct rq *this_rq, long adjust) +diff -urNp -x '*.orig' linux-4.9/kernel/signal.c linux-4.9/kernel/signal.c +--- linux-4.9/kernel/signal.c 2021-02-24 15:47:32.490682033 +0100 ++++ linux-4.9/kernel/signal.c 2021-02-24 15:47:45.117743722 +0100 +@@ -34,6 +34,8 @@ + #include + #include + #include +#include +#include + #define CREATE_TRACE_POINTS #include - -@@ -791,9 +793,18 @@ static int check_kill_permission(int sig +@@ -782,9 +784,18 @@ static int check_kill_permission(int sig struct pid *sid; int error; @@ -14888,7 +13776,7 @@ diff -NurpP --minimal linux-3.7/kernel/signal.c linux-3.7-vs2.3.5.1/kernel/signa if (!si_fromuser(info)) return 0; -@@ -817,6 +828,20 @@ static int check_kill_permission(int sig +@@ -808,6 +819,20 @@ static int check_kill_permission(int sig } } @@ -14909,16 +13797,24 @@ diff -NurpP --minimal linux-3.7/kernel/signal.c linux-3.7-vs2.3.5.1/kernel/signa return security_task_kill(t, info, sig, 0); } -@@ -1352,7 +1377,7 @@ int kill_pid_info(int sig, struct siginf - rcu_read_lock(); - retry: - p = pid_task(pid, PIDTYPE_PID); -- if (p) { -+ if (p && vx_check(vx_task_xid(p), VS_IDENT)) { - error = group_send_sig_info(sig, info, p); - if (unlikely(error == -ESRCH)) - /* -@@ -1400,7 +1425,7 @@ int kill_pid_info_as_cred(int sig, struc +@@ -1359,8 +1384,14 @@ int kill_pid_info(int sig, struct siginf + for (;;) { + rcu_read_lock(); + p = pid_task(pid, PIDTYPE_PID); +- if (p) +- error = group_send_sig_info(sig, info, p); ++ if (p) { ++ if (vx_check(vx_task_xid(p), VS_IDENT)) ++ error = group_send_sig_info(sig, info, p); ++ else { ++ rcu_read_unlock(); ++ return -ESRCH; ++ } ++ } + rcu_read_unlock(); + if (likely(!p || error != -ESRCH)) + return error; +@@ -1405,7 +1436,7 @@ int kill_pid_info_as_cred(int sig, struc rcu_read_lock(); p = pid_task(pid, PIDTYPE_PID); @@ -14927,7 +13823,7 @@ diff -NurpP --minimal linux-3.7/kernel/signal.c linux-3.7-vs2.3.5.1/kernel/signa ret = -ESRCH; goto out_unlock; } -@@ -1452,8 +1477,10 @@ static int kill_something_info(int sig, +@@ -1461,8 +1492,10 @@ static int kill_something_info(int sig, struct task_struct * p; for_each_process(p) { @@ -14940,41 +13836,41 @@ diff -NurpP --minimal linux-3.7/kernel/signal.c linux-3.7-vs2.3.5.1/kernel/signa int err = group_send_sig_info(sig, info, p); ++count; if (err != -EPERM) -@@ -2308,6 +2335,11 @@ relock: +@@ -2333,6 +2366,11 @@ relock: !sig_kernel_only(signr)) continue; + /* virtual init is protected against user signals */ -+ if ((info->si_code == SI_USER) && ++ if ((ksig->info.si_code == SI_USER) && + vx_current_initpid(current->pid)) + continue; + if (sig_kernel_stop(signr)) { /* * The default action is to stop all threads in -diff -NurpP --minimal linux-3.7/kernel/softirq.c linux-3.7-vs2.3.5.1/kernel/softirq.c ---- linux-3.7/kernel/softirq.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/softirq.c 2012-12-11 15:56:33.000000000 +0000 -@@ -25,6 +25,7 @@ - #include +diff -urNp -x '*.orig' linux-4.9/kernel/softirq.c linux-4.9/kernel/softirq.c +--- linux-4.9/kernel/softirq.c 2021-02-24 15:47:32.490682033 +0100 ++++ linux-4.9/kernel/softirq.c 2021-02-24 15:47:45.117743722 +0100 +@@ -26,6 +26,7 @@ #include #include + #include +#include #define CREATE_TRACE_POINTS #include -diff -NurpP --minimal linux-3.7/kernel/sys.c linux-3.7-vs2.3.5.1/kernel/sys.c ---- linux-3.7/kernel/sys.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/sys.c 2012-12-11 15:56:33.000000000 +0000 -@@ -47,6 +47,7 @@ - #include - #include - #include -+#include +diff -urNp -x '*.orig' linux-4.9/kernel/sys.c linux-4.9/kernel/sys.c +--- linux-4.9/kernel/sys.c 2021-02-24 15:47:32.490682033 +0100 ++++ linux-4.9/kernel/sys.c 2021-02-24 15:47:45.117743722 +0100 +@@ -56,6 +56,7 @@ + #include #include ++#include /* Move somewhere else to avoid recompiling? */ -@@ -154,7 +155,10 @@ static int set_one_prio(struct task_stru + #include + +@@ -159,7 +160,10 @@ static int set_one_prio(struct task_stru goto out; } if (niceval < task_nice(p) && !can_nice(p, niceval)) { @@ -14986,44 +13882,34 @@ diff -NurpP --minimal linux-3.7/kernel/sys.c linux-3.7-vs2.3.5.1/kernel/sys.c goto out; } no_nice = security_task_setnice(p, niceval); -@@ -205,6 +209,8 @@ SYSCALL_DEFINE3(setpriority, int, which, - else - pgrp = task_pgrp(current); - do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { -+ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) -+ continue; - error = set_one_prio(p, niceval, error); - } while_each_pid_thread(pgrp, PIDTYPE_PGID, p); - break; -@@ -270,6 +276,8 @@ SYSCALL_DEFINE2(getpriority, int, which, - else - pgrp = task_pgrp(current); - do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { -+ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) -+ continue; - niceval = 20 - task_nice(p); +@@ -210,6 +214,8 @@ SYSCALL_DEFINE3(setpriority, int, which, + else + pgrp = task_pgrp(current); + do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { ++ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) ++ continue; + error = set_one_prio(p, niceval, error); + } while_each_pid_thread(pgrp, PIDTYPE_PGID, p); + break; +@@ -276,6 +282,8 @@ SYSCALL_DEFINE2(getpriority, int, which, + else + pgrp = task_pgrp(current); + do_each_pid_thread(pgrp, PIDTYPE_PGID, p) { ++ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) ++ continue; + niceval = nice_to_rlimit(task_nice(p)); + if (niceval > retval) + retval = niceval; +@@ -292,6 +300,8 @@ SYSCALL_DEFINE2(getpriority, int, which, + goto out_unlock; /* No processes for this user */ + } + do_each_thread(g, p) { ++ if (!vx_check(p->xid, VS_ADMIN_P | VS_IDENT)) ++ continue; + if (uid_eq(task_uid(p), uid) && task_pid_vnr(p)) { + niceval = nice_to_rlimit(task_nice(p)); if (niceval > retval) - retval = niceval; -@@ -422,6 +430,8 @@ EXPORT_SYMBOL_GPL(kernel_power_off); - - static DEFINE_MUTEX(reboot_mutex); - -+long vs_reboot(unsigned int, void __user *); -+ - /* - * Reboot system call: for obvious reasons only root may call it, - * and even root needs to set up some magic numbers in the registers -@@ -463,6 +473,9 @@ SYSCALL_DEFINE4(reboot, int, magic1, int - if ((cmd == LINUX_REBOOT_CMD_POWER_OFF) && !pm_power_off) - cmd = LINUX_REBOOT_CMD_HALT; - -+ if (!vx_check(0, VS_ADMIN|VS_WATCH)) -+ return vs_reboot(cmd, arg); -+ - mutex_lock(&reboot_mutex); - switch (cmd) { - case LINUX_REBOOT_CMD_RESTART: -@@ -1370,7 +1383,8 @@ SYSCALL_DEFINE2(sethostname, char __user +@@ -1213,7 +1223,8 @@ SYSCALL_DEFINE2(sethostname, char __user int errno; char tmp[__NEW_UTS_LEN]; @@ -15033,7 +13919,7 @@ diff -NurpP --minimal linux-3.7/kernel/sys.c linux-3.7-vs2.3.5.1/kernel/sys.c return -EPERM; if (len < 0 || len > __NEW_UTS_LEN) -@@ -1421,7 +1435,8 @@ SYSCALL_DEFINE2(setdomainname, char __us +@@ -1266,7 +1277,8 @@ SYSCALL_DEFINE2(setdomainname, char __us int errno; char tmp[__NEW_UTS_LEN]; @@ -15043,7 +13929,7 @@ diff -NurpP --minimal linux-3.7/kernel/sys.c linux-3.7-vs2.3.5.1/kernel/sys.c return -EPERM; if (len < 0 || len > __NEW_UTS_LEN) return -EINVAL; -@@ -1540,7 +1555,7 @@ int do_prlimit(struct task_struct *tsk, +@@ -1386,7 +1398,7 @@ int do_prlimit(struct task_struct *tsk, /* Keep the capable check against init_user_ns until cgroups can contain all limits */ if (new_rlim->rlim_max > rlim->rlim_max && @@ -15052,7 +13938,7 @@ diff -NurpP --minimal linux-3.7/kernel/sys.c linux-3.7-vs2.3.5.1/kernel/sys.c retval = -EPERM; if (!retval) retval = security_task_setrlimit(tsk->group_leader, -@@ -1593,7 +1608,8 @@ static int check_prlimit_permission(stru +@@ -1439,7 +1451,8 @@ static int check_prlimit_permission(stru gid_eq(cred->gid, tcred->sgid) && gid_eq(cred->gid, tcred->gid)) return 0; @@ -15062,10 +13948,24 @@ diff -NurpP --minimal linux-3.7/kernel/sys.c linux-3.7-vs2.3.5.1/kernel/sys.c return 0; return -EPERM; -diff -NurpP --minimal linux-3.7/kernel/sysctl.c linux-3.7-vs2.3.5.1/kernel/sysctl.c ---- linux-3.7/kernel/sysctl.c 2012-12-11 15:47:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/sysctl.c 2012-12-11 15:56:33.000000000 +0000 -@@ -82,6 +82,7 @@ +@@ -2328,7 +2341,12 @@ static int do_sysinfo(struct sysinfo *in + + get_avenrun(info->loads, 0, SI_LOAD_SHIFT - FSHIFT); + +- info->procs = nr_threads; ++ if (vx_flags(VXF_VIRT_LOAD, 0)) { ++ struct vx_info *vxi = current_vx_info(); ++ info->procs = atomic_read(&vxi->cvirt.nr_threads); ++ } else { ++ info->procs = nr_threads; ++ } + + si_meminfo(info); + si_swapinfo(info); +diff -urNp -x '*.orig' linux-4.9/kernel/sysctl.c linux-4.9/kernel/sysctl.c +--- linux-4.9/kernel/sysctl.c 2021-02-24 15:47:32.490682033 +0100 ++++ linux-4.9/kernel/sysctl.c 2021-02-24 15:47:45.117743722 +0100 +@@ -87,6 +87,7 @@ #if defined(CONFIG_PROVE_LOCKING) || defined(CONFIG_LOCK_STAT) #include #endif @@ -15073,24 +13973,32 @@ diff -NurpP --minimal linux-3.7/kernel/sysctl.c linux-3.7-vs2.3.5.1/kernel/sysct #ifdef CONFIG_CHR_DEV_SG #include #endif -@@ -574,6 +575,13 @@ static struct ctl_table kern_table[] = { - .proc_handler = proc_dostring, - }, - #endif -+ { +@@ -284,6 +285,13 @@ static int max_extfrag_threshold = 1000; + + static struct ctl_table kern_table[] = { + { + .procname = "vshelper", + .data = &vshelper_path, + .maxlen = 256, + .mode = 0644, -+ .proc_handler = &proc_dostring, ++ .proc_handler = proc_dostring, + }, - #ifdef CONFIG_CHR_DEV_SG ++ { + .procname = "sched_child_runs_first", + .data = &sysctl_sched_child_runs_first, + .maxlen = sizeof(unsigned int), +@@ -1429,7 +1437,6 @@ static struct ctl_table vm_table[] = { + .extra1 = &zero, + .extra2 = &one, + }, +- + #endif /* CONFIG_COMPACTION */ { - .procname = "sg-big-buff", -diff -NurpP --minimal linux-3.7/kernel/sysctl_binary.c linux-3.7-vs2.3.5.1/kernel/sysctl_binary.c ---- linux-3.7/kernel/sysctl_binary.c 2012-10-04 13:27:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/sysctl_binary.c 2012-12-11 15:56:33.000000000 +0000 -@@ -73,6 +73,7 @@ static const struct bin_table bin_kern_t + .procname = "min_free_kbytes", +diff -urNp -x '*.orig' linux-4.9/kernel/sysctl_binary.c linux-4.9/kernel/sysctl_binary.c +--- linux-4.9/kernel/sysctl_binary.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/kernel/sysctl_binary.c 2021-02-24 15:47:45.117743722 +0100 +@@ -74,6 +74,7 @@ static const struct bin_table bin_kern_t { CTL_INT, KERN_PANIC, "panic" }, { CTL_INT, KERN_REALROOTDEV, "real-root-dev" }, @@ -15098,29 +14006,48 @@ diff -NurpP --minimal linux-3.7/kernel/sysctl_binary.c linux-3.7-vs2.3.5.1/kerne { CTL_STR, KERN_SPARC_REBOOT, "reboot-cmd" }, { CTL_INT, KERN_CTLALTDEL, "ctrl-alt-del" }, -diff -NurpP --minimal linux-3.7/kernel/time/timekeeping.c linux-3.7-vs2.3.5.1/kernel/time/timekeeping.c ---- linux-3.7/kernel/time/timekeeping.c 2012-12-11 15:47:49.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/time/timekeeping.c 2012-12-11 21:13:56.000000000 +0000 -@@ -21,6 +21,7 @@ - #include - #include - #include -+#include - +diff -urNp -x '*.orig' linux-4.9/kernel/time/posix-timers.c linux-4.9/kernel/time/posix-timers.c +--- linux-4.9/kernel/time/posix-timers.c 2021-02-24 15:47:32.494015471 +0100 ++++ linux-4.9/kernel/time/posix-timers.c 2021-02-24 15:47:45.117743722 +0100 +@@ -48,6 +48,7 @@ + #include + #include + #include ++#include - static struct timekeeper timekeeper; -@@ -243,6 +244,7 @@ void getnstimeofday(struct timespec *ts) + #include "timekeeping.h" - ts->tv_nsec = 0; - timespec_add_ns(ts, nsecs); -+ vx_adjust_timespec(ts); +@@ -417,6 +418,7 @@ int posix_timer_event(struct k_itimer *t + { + struct task_struct *task; + int shared, ret = -1; ++ + /* + * FIXME: if ->sigq is queued we can race with + * dequeue_signal()->do_schedule_next_timer(). +@@ -433,10 +435,18 @@ int posix_timer_event(struct k_itimer *t + rcu_read_lock(); + task = pid_task(timr->it_pid, PIDTYPE_PID); + if (task) { ++ struct vx_info_save vxis; ++ struct vx_info *vxi; ++ ++ vxi = get_vx_info(task->vx_info); ++ enter_vx_info(vxi, &vxis); + shared = !(timr->it_sigev_notify & SIGEV_THREAD_ID); + ret = send_sigqueue(timr->sigq, task, shared); ++ leave_vx_info(&vxis); ++ put_vx_info(vxi); + } + rcu_read_unlock(); ++ + /* If we failed to send the signal the timer stops. */ + return ret > 0; } - EXPORT_SYMBOL(getnstimeofday); - -diff -NurpP --minimal linux-3.7/kernel/time.c linux-3.7-vs2.3.5.1/kernel/time.c ---- linux-3.7/kernel/time.c 2012-12-11 15:47:49.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/time.c 2012-12-11 21:12:29.000000000 +0000 -@@ -37,6 +37,7 @@ +diff -urNp -x '*.orig' linux-4.9/kernel/time/time.c linux-4.9/kernel/time/time.c +--- linux-4.9/kernel/time/time.c 2021-02-24 15:47:32.494015471 +0100 ++++ linux-4.9/kernel/time/time.c 2021-02-24 15:47:45.117743722 +0100 +@@ -38,6 +38,7 @@ #include #include #include @@ -15128,7 +14055,7 @@ diff -NurpP --minimal linux-3.7/kernel/time.c linux-3.7-vs2.3.5.1/kernel/time.c #include #include -@@ -92,7 +93,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, +@@ -94,7 +95,7 @@ SYSCALL_DEFINE1(stime, time_t __user *, if (err) return err; @@ -15137,22 +14064,50 @@ diff -NurpP --minimal linux-3.7/kernel/time.c linux-3.7-vs2.3.5.1/kernel/time.c return 0; } -@@ -172,7 +173,7 @@ int do_sys_settimeofday(const struct tim +@@ -187,7 +188,7 @@ int do_sys_settimeofday64(const struct t } } if (tv) -- return do_settimeofday(tv); -+ return vx_settimeofday(tv); +- return do_settimeofday64(tv); ++ return vx_settimeofday64(tv); return 0; } -diff -NurpP --minimal linux-3.7/kernel/timer.c linux-3.7-vs2.3.5.1/kernel/timer.c ---- linux-3.7/kernel/timer.c 2012-12-11 15:47:49.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/timer.c 2012-12-11 15:56:33.000000000 +0000 -@@ -40,6 +40,10 @@ - #include - #include +diff -urNp -x '*.orig' linux-4.9/kernel/time/timekeeping.c linux-4.9/kernel/time/timekeeping.c +--- linux-4.9/kernel/time/timekeeping.c 2021-02-24 15:47:32.494015471 +0100 ++++ linux-4.9/kernel/time/timekeeping.c 2021-02-24 15:47:45.121077159 +0100 +@@ -23,6 +23,8 @@ + #include + #include + #include ++#include ++#include + + #include "tick-internal.h" + #include "ntp_internal.h" +@@ -768,6 +770,15 @@ ktime_t ktime_get_with_offset(enum tk_of + + } while (read_seqcount_retry(&tk_core.seq, seq)); + ++#ifdef CONFIG_VSERVER_VTIME ++ if ((offs == TK_OFFS_BOOT) && ++ vx_flags(VXF_VIRT_UPTIME, 0) && ++ !vx_check(0, VS_ADMIN|VS_WATCH)) { ++ struct vx_info *vxi = current_vx_info(); ++ ktime_t bias_uptime = timespec64_to_ktime(vxi->cvirt.bias_uptime); ++ base = ktime_sub(base, bias_uptime); ++ } ++#endif + return ktime_add_ns(base, nsecs); + + } +diff -urNp -x '*.orig' linux-4.9/kernel/time/timer.c linux-4.9/kernel/time/timer.c +--- linux-4.9/kernel/time/timer.c 2021-02-24 15:47:32.494015471 +0100 ++++ linux-4.9/kernel/time/timer.c 2021-02-24 15:47:45.121077159 +0100 +@@ -43,6 +43,10 @@ #include + #include + #include +#include +#include +#include @@ -15160,46 +14115,64 @@ diff -NurpP --minimal linux-3.7/kernel/timer.c linux-3.7-vs2.3.5.1/kernel/timer. #include #include -diff -NurpP --minimal linux-3.7/kernel/user_namespace.c linux-3.7-vs2.3.5.1/kernel/user_namespace.c ---- linux-3.7/kernel/user_namespace.c 2012-12-11 15:47:49.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/user_namespace.c 2012-12-11 16:58:02.000000000 +0000 -@@ -20,6 +20,7 @@ - #include +diff -urNp -x '*.orig' linux-4.9/kernel/user_namespace.c linux-4.9/kernel/user_namespace.c +--- linux-4.9/kernel/user_namespace.c 2021-02-24 15:47:32.504015783 +0100 ++++ linux-4.9/kernel/user_namespace.c 2021-02-24 15:47:45.121077159 +0100 +@@ -22,6 +22,7 @@ #include #include + #include +#include static struct kmem_cache *user_ns_cachep __read_mostly; + static DEFINE_MUTEX(userns_state_mutex); +@@ -115,6 +116,7 @@ int create_user_ns(struct cred *new) -@@ -53,6 +54,7 @@ int create_user_ns(struct cred *new) - return -ENOMEM; - - kref_init(&ns->kref); + atomic_set(&ns->count, 1); + /* Leave the new->user_ns reference with the new user namespace. */ + atomic_inc(&vs_global_user_ns); ns->parent = parent_ns; + ns->level = parent_ns->level + 1; ns->owner = owner; - ns->group = group; -@@ -85,6 +87,9 @@ void free_user_ns(struct kref *kref) +@@ -185,6 +187,7 @@ static void free_user_ns(struct work_str + key_put(ns->persistent_keyring_register); + #endif + ns_free_inum(&ns->ns); ++ atomic_dec(&vs_global_user_ns); + kmem_cache_free(user_ns_cachep, ns); + dec_user_namespaces(ucounts); + ns = parent; +@@ -404,6 +407,18 @@ gid_t from_kgid_munged(struct user_names + } + EXPORT_SYMBOL(from_kgid_munged); - parent = ns->parent; - kmem_cache_free(user_ns_cachep, ns); ++ktag_t make_ktag(struct user_namespace *from, vtag_t tag) ++{ ++ return KTAGT_INIT(tag); ++} ++EXPORT_SYMBOL(make_ktag); + -+ /* FIXME: maybe move into destroyer? */ -+ atomic_dec(&vs_global_user_ns); - put_user_ns(parent); - } - EXPORT_SYMBOL(free_user_ns); -diff -NurpP --minimal linux-3.7/kernel/utsname.c linux-3.7-vs2.3.5.1/kernel/utsname.c ---- linux-3.7/kernel/utsname.c 2012-07-22 21:39:47.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/utsname.c 2012-12-11 15:56:33.000000000 +0000 -@@ -16,14 +16,17 @@ ++vtag_t from_ktag(struct user_namespace *to, ktag_t tag) ++{ ++ return __ktag_val(tag); ++} ++EXPORT_SYMBOL(from_ktag); ++ + /** + * make_kprojid - Map a user-namespace projid pair into a kprojid. + * @ns: User namespace that the projid is in +diff -urNp -x '*.orig' linux-4.9/kernel/utsname.c linux-4.9/kernel/utsname.c +--- linux-4.9/kernel/utsname.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/kernel/utsname.c 2021-02-24 15:47:45.121077159 +0100 +@@ -16,6 +16,7 @@ #include #include - #include + #include +#include - static struct uts_namespace *create_uts_ns(void) + static struct ucounts *inc_uts_namespaces(struct user_namespace *ns) { +@@ -32,8 +33,10 @@ static struct uts_namespace *create_uts_ struct uts_namespace *uts_ns; uts_ns = kmalloc(sizeof(struct uts_namespace), GFP_KERNEL); @@ -15211,59 +14184,18 @@ diff -NurpP --minimal linux-3.7/kernel/utsname.c linux-3.7-vs2.3.5.1/kernel/utsn return uts_ns; } -@@ -32,8 +35,8 @@ static struct uts_namespace *create_uts_ - * @old_ns: namespace to clone - * Return NULL on error (failure to kmalloc), new ns otherwise - */ --static struct uts_namespace *clone_uts_ns(struct task_struct *tsk, -- struct uts_namespace *old_ns) -+static struct uts_namespace *clone_uts_ns(struct uts_namespace *old_ns, -+ struct user_namespace *old_user) - { - struct uts_namespace *ns; - -@@ -43,7 +46,7 @@ static struct uts_namespace *clone_uts_n - - down_read(&uts_sem); - memcpy(&ns->name, &old_ns->name, sizeof(ns->name)); -- ns->user_ns = get_user_ns(task_cred_xxx(tsk, user_ns)); -+ ns->user_ns = get_user_ns(old_user); - up_read(&uts_sem); - return ns; - } -@@ -55,9 +58,9 @@ static struct uts_namespace *clone_uts_n - * versa. - */ - struct uts_namespace *copy_utsname(unsigned long flags, -- struct task_struct *tsk) -+ struct uts_namespace *old_ns, -+ struct user_namespace *user_ns) - { -- struct uts_namespace *old_ns = tsk->nsproxy->uts_ns; - struct uts_namespace *new_ns; - - BUG_ON(!old_ns); -@@ -66,7 +69,7 @@ struct uts_namespace *copy_utsname(unsig - if (!(flags & CLONE_NEWUTS)) - return old_ns; - -- new_ns = clone_uts_ns(tsk, old_ns); -+ new_ns = clone_uts_ns(old_ns, user_ns); - - put_uts_ns(old_ns); - return new_ns; -@@ -78,6 +81,7 @@ void free_uts_ns(struct kref *kref) - - ns = container_of(kref, struct uts_namespace, kref); +@@ -111,6 +114,7 @@ void free_uts_ns(struct kref *kref) + dec_uts_namespaces(ns->ucounts); put_user_ns(ns->user_ns); + ns_free_inum(&ns->ns); + atomic_dec(&vs_global_uts_ns); kfree(ns); } -diff -NurpP --minimal linux-3.7/kernel/vserver/Kconfig linux-3.7-vs2.3.5.1/kernel/vserver/Kconfig ---- linux-3.7/kernel/vserver/Kconfig 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/Kconfig 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,233 @@ +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/Kconfig linux-4.9/kernel/vserver/Kconfig +--- linux-4.9/kernel/vserver/Kconfig 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/Kconfig 2021-02-24 15:47:45.124410596 +0100 +@@ -0,0 +1,230 @@ +# +# Linux VServer configuration +# @@ -15280,8 +14212,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/Kconfig linux-3.7-vs2.3.5.1/kerne + +config VSERVER_AUTO_SINGLE + bool "Automatic Single IP Special Casing" -+ depends on EXPERIMENTAL -+ default y ++ default n + help + This allows network contexts with a single IP to + automatically remap 0.0.0.0 bindings to that IP, @@ -15301,8 +14232,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/Kconfig linux-3.7-vs2.3.5.1/kerne + link and create a copy of the unified file) + +config VSERVER_VTIME -+ bool "Enable Virtualized Guest Time" -+ depends on EXPERIMENTAL ++ bool "Enable Virtualized Guest Time (EXPERIMENTAL)" + default n + help + This enables per guest time offsets to allow for @@ -15311,8 +14241,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/Kconfig linux-3.7-vs2.3.5.1/kerne + therefore should not be enabled without good reason. + +config VSERVER_DEVICE -+ bool "Enable Guest Device Mapping" -+ depends on EXPERIMENTAL ++ bool "Enable Guest Device Mapping (EXPERIMENTAL)" + default n + help + This enables generic device remapping. @@ -15497,9 +14426,9 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/Kconfig linux-3.7-vs2.3.5.1/kerne + bool + default n + -diff -NurpP --minimal linux-3.7/kernel/vserver/Makefile linux-3.7-vs2.3.5.1/kernel/vserver/Makefile ---- linux-3.7/kernel/vserver/Makefile 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/Makefile 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/Makefile linux-4.9/kernel/vserver/Makefile +--- linux-4.9/kernel/vserver/Makefile 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/Makefile 2021-02-24 15:47:45.124410596 +0100 @@ -0,0 +1,18 @@ +# +# Makefile for the Linux vserver routines. @@ -15519,16 +14448,16 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/Makefile linux-3.7-vs2.3.5.1/kern +vserver-$(CONFIG_VSERVER_MONITOR) += monitor.o +vserver-$(CONFIG_VSERVER_DEVICE) += device.o + -diff -NurpP --minimal linux-3.7/kernel/vserver/cacct.c linux-3.7-vs2.3.5.1/kernel/vserver/cacct.c ---- linux-3.7/kernel/vserver/cacct.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/cacct.c 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/cacct.c linux-4.9/kernel/vserver/cacct.c +--- linux-4.9/kernel/vserver/cacct.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/cacct.c 2021-02-24 15:47:45.121077159 +0100 @@ -0,0 +1,42 @@ +/* + * linux/kernel/vserver/cacct.c + * + * Virtual Server: Context Accounting + * -+ * Copyright (C) 2006-2007 Herbert Pötzl ++ * Copyright (C) 2006-2007 Herbert P?tzl + * + * V0.01 added accounting stats + * @@ -15565,9 +14494,9 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/cacct.c linux-3.7-vs2.3.5.1/kerne + return 0; +} + -diff -NurpP --minimal linux-3.7/kernel/vserver/cacct_init.h linux-3.7-vs2.3.5.1/kernel/vserver/cacct_init.h ---- linux-3.7/kernel/vserver/cacct_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/cacct_init.h 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/cacct_init.h linux-4.9/kernel/vserver/cacct_init.h +--- linux-4.9/kernel/vserver/cacct_init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/cacct_init.h 2021-02-24 15:47:45.121077159 +0100 @@ -0,0 +1,25 @@ + + @@ -15594,9 +14523,9 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/cacct_init.h linux-3.7-vs2.3.5.1/ + return; +} + -diff -NurpP --minimal linux-3.7/kernel/vserver/cacct_proc.h linux-3.7-vs2.3.5.1/kernel/vserver/cacct_proc.h ---- linux-3.7/kernel/vserver/cacct_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/cacct_proc.h 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/cacct_proc.h linux-4.9/kernel/vserver/cacct_proc.h +--- linux-4.9/kernel/vserver/cacct_proc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/cacct_proc.h 2021-02-24 15:47:45.121077159 +0100 @@ -0,0 +1,53 @@ +#ifndef _VX_CACCT_PROC_H +#define _VX_CACCT_PROC_H @@ -15651,16 +14580,16 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/cacct_proc.h linux-3.7-vs2.3.5.1/ +} + +#endif /* _VX_CACCT_PROC_H */ -diff -NurpP --minimal linux-3.7/kernel/vserver/context.c linux-3.7-vs2.3.5.1/kernel/vserver/context.c ---- linux-3.7/kernel/vserver/context.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/context.c 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/context.c linux-4.9/kernel/vserver/context.c +--- linux-4.9/kernel/vserver/context.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/context.c 2021-02-24 15:47:45.121077159 +0100 @@ -0,0 +1,1119 @@ +/* + * linux/kernel/vserver/context.c + * + * Virtual Server: Context Support + * -+ * Copyright (C) 2003-2011 Herbert Pötzl ++ * Copyright (C) 2003-2011 Herbert P?tzl + * + * V0.01 context helper + * V0.02 vx_ctx_kill syscall command @@ -15727,7 +14656,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/context.c linux-3.7-vs2.3.5.1/ker + * allocate an initialized vx_info struct + * doesn't make it visible (hash) */ + -+static struct vx_info *__alloc_vx_info(xid_t xid) ++static struct vx_info *__alloc_vx_info(vxid_t xid) +{ + struct vx_info *new = NULL; + int cpu, index; @@ -15926,7 +14855,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/context.c linux-3.7-vs2.3.5.1/ker +static DEFINE_SPINLOCK(vx_info_hash_lock); + + -+static inline unsigned int __hashval(xid_t xid) ++static inline unsigned int __hashval(vxid_t xid) +{ + return (xid % VX_HASH_SIZE); +} @@ -15990,7 +14919,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/context.c linux-3.7-vs2.3.5.1/ker + * requires the hash_lock to be held + * doesn't increment the vx_refcnt */ + -+static inline struct vx_info *__lookup_vx_info(xid_t xid) ++static inline struct vx_info *__lookup_vx_info(vxid_t xid) +{ + struct hlist_head *head = &vx_info_hash[__hashval(xid)]; + struct hlist_node *pos; @@ -16092,7 +15021,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/context.c linux-3.7-vs2.3.5.1/ker + + * verify that xid is still hashed */ + -+int xid_is_hashed(xid_t xid) ++int xid_is_hashed(vxid_t xid) +{ + int hashed; + @@ -16308,7 +15237,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/context.c linux-3.7-vs2.3.5.1/ker + + ret = unshare_nsproxy_namespaces( + CLONE_NEWUTS | CLONE_NEWIPC | CLONE_NEWUSER, -+ &new_nsp, NULL); ++ &new_nsp, NULL, NULL); + if (ret) + goto out; + @@ -16447,7 +15376,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/context.c linux-3.7-vs2.3.5.1/ker + +int vc_task_xid(uint32_t id) +{ -+ xid_t xid; ++ vxid_t xid; + + if (id) { + struct task_struct *tsk; @@ -16774,16 +15703,16 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/context.c linux-3.7-vs2.3.5.1/ker + +EXPORT_SYMBOL_GPL(free_vx_info); + -diff -NurpP --minimal linux-3.7/kernel/vserver/cvirt.c linux-3.7-vs2.3.5.1/kernel/vserver/cvirt.c ---- linux-3.7/kernel/vserver/cvirt.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/cvirt.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,313 @@ +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/cvirt.c linux-4.9/kernel/vserver/cvirt.c +--- linux-4.9/kernel/vserver/cvirt.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/cvirt.c 2021-02-24 15:47:45.121077159 +0100 +@@ -0,0 +1,350 @@ +/* + * linux/kernel/vserver/cvirt.c + * + * Virtual Server: Context Virtualization + * -+ * Copyright (C) 2004-2007 Herbert Pötzl ++ * Copyright (C) 2004-2007 Herbert P?tzl + * + * V0.01 broken out from limit.c + * V0.02 added utsname stuff @@ -16800,11 +15729,11 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/cvirt.c linux-3.7-vs2.3.5.1/kerne +#include + + -+void vx_vsi_boottime(struct timespec *boottime) ++void vx_vsi_boottime64(struct timespec64 *boottime) +{ + struct vx_info *vxi = current_vx_info(); + -+ set_normalized_timespec(boottime, ++ set_normalized_timespec64(boottime, + boottime->tv_sec + vxi->cvirt.bias_uptime.tv_sec, + boottime->tv_nsec + vxi->cvirt.bias_uptime.tv_nsec); + return; @@ -17025,15 +15954,15 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/cvirt.c linux-3.7-vs2.3.5.1/kerne +{ + struct vcmd_virt_stat_v0 vc_data; + struct _vx_cvirt *cvirt = &vxi->cvirt; -+ struct timespec uptime; ++ struct timespec64 uptime; + -+ do_posix_clock_monotonic_gettime(&uptime); -+ set_normalized_timespec(&uptime, ++ ktime_get_ts64(&uptime); ++ set_normalized_timespec64(&uptime, + uptime.tv_sec - cvirt->bias_uptime.tv_sec, + uptime.tv_nsec - cvirt->bias_uptime.tv_nsec); + -+ vc_data.offset = timespec_to_ns(&cvirt->bias_ts); -+ vc_data.uptime = timespec_to_ns(&uptime); ++ vc_data.offset = timespec64_to_ns(&cvirt->bias_ts); ++ vc_data.uptime = timespec64_to_ns(&uptime); + vc_data.nr_threads = atomic_read(&cvirt->nr_threads); + vc_data.nr_running = atomic_read(&cvirt->nr_running); + vc_data.nr_uninterruptible = atomic_read(&cvirt->nr_uninterruptible); @@ -17073,6 +16002,26 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/cvirt.c linux-3.7-vs2.3.5.1/kerne + } +} + ++void vx_adjust_timespec64(struct timespec64 *ts) ++{ ++ struct vx_info *vxi; ++ ++ if (!vx_flags(VXF_VIRT_TIME, 0)) ++ return; ++ ++ vxi = current_vx_info(); ++ ts->tv_sec += vxi->cvirt.bias_ts.tv_sec; ++ ts->tv_nsec += vxi->cvirt.bias_ts.tv_nsec; ++ ++ if (ts->tv_nsec >= NSEC_PER_SEC) { ++ ts->tv_sec++; ++ ts->tv_nsec -= NSEC_PER_SEC; ++ } else if (ts->tv_nsec < 0) { ++ ts->tv_sec--; ++ ts->tv_nsec += NSEC_PER_SEC; ++ } ++} ++ +int vx_settimeofday(const struct timespec *ts) +{ + struct timespec ats, delta; @@ -17085,15 +16034,32 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/cvirt.c linux-3.7-vs2.3.5.1/kerne + delta = timespec_sub(*ts, ats); + + vxi = current_vx_info(); -+ vxi->cvirt.bias_ts = timespec_add(vxi->cvirt.bias_ts, delta); ++ vxi->cvirt.bias_ts = timespec64_add(vxi->cvirt.bias_ts, ++ timespec_to_timespec64(delta)); ++ return 0; ++} ++ ++int vx_settimeofday64(const struct timespec64 *ts) ++{ ++ struct timespec64 ats, delta; ++ struct vx_info *vxi; ++ ++ if (!vx_flags(VXF_VIRT_TIME, 0)) ++ return do_settimeofday64(ts); ++ ++ getnstimeofday64(&ats); ++ delta = timespec64_sub(*ts, ats); ++ ++ vxi = current_vx_info(); ++ vxi->cvirt.bias_ts = timespec64_add(vxi->cvirt.bias_ts, delta); + return 0; +} + +#endif + -diff -NurpP --minimal linux-3.7/kernel/vserver/cvirt_init.h linux-3.7-vs2.3.5.1/kernel/vserver/cvirt_init.h ---- linux-3.7/kernel/vserver/cvirt_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/cvirt_init.h 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/cvirt_init.h linux-4.9/kernel/vserver/cvirt_init.h +--- linux-4.9/kernel/vserver/cvirt_init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/cvirt_init.h 2021-02-24 15:47:45.121077159 +0100 @@ -0,0 +1,70 @@ + + @@ -17104,14 +16070,14 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/cvirt_init.h linux-3.7-vs2.3.5.1/ + uint64_t idle_jiffies = vx_idle_jiffies(); + uint64_t nsuptime; + -+ do_posix_clock_monotonic_gettime(&cvirt->bias_uptime); ++ ktime_get_ts64(&cvirt->bias_uptime); + nsuptime = (unsigned long long)cvirt->bias_uptime.tv_sec + * NSEC_PER_SEC + cvirt->bias_uptime.tv_nsec; + cvirt->bias_clock = nsec_to_clock_t(nsuptime); + cvirt->bias_ts.tv_sec = 0; + cvirt->bias_ts.tv_nsec = 0; + -+ jiffies_to_timespec(idle_jiffies, &cvirt->bias_idle); ++ jiffies_to_timespec64(idle_jiffies, &cvirt->bias_idle); + atomic_set(&cvirt->nr_threads, 0); + atomic_set(&cvirt->nr_running, 0); + atomic_set(&cvirt->nr_uninterruptible, 0); @@ -17165,9 +16131,9 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/cvirt_init.h linux-3.7-vs2.3.5.1/ + return; +} + -diff -NurpP --minimal linux-3.7/kernel/vserver/cvirt_proc.h linux-3.7-vs2.3.5.1/kernel/vserver/cvirt_proc.h ---- linux-3.7/kernel/vserver/cvirt_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/cvirt_proc.h 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/cvirt_proc.h linux-4.9/kernel/vserver/cvirt_proc.h +--- linux-4.9/kernel/vserver/cvirt_proc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/cvirt_proc.h 2021-02-24 15:47:45.121077159 +0100 @@ -0,0 +1,123 @@ +#ifndef _VX_CVIRT_PROC_H +#define _VX_CVIRT_PROC_H @@ -17230,7 +16196,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/cvirt_proc.h linux-3.7-vs2.3.5.1/ + length += sprintf(buffer + length, + "SEMS:\t\t%d %d %d %d %d\n" + "MSG:\t\t%d %d %d\n" -+ "SHM:\t\t%lu %lu %d %d\n", ++ "SHM:\t\t%lu %lu %d %ld\n", + ipc->sem_ctls[0], ipc->sem_ctls[1], + ipc->sem_ctls[2], ipc->sem_ctls[3], + ipc->used_sems, @@ -17256,8 +16222,8 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/cvirt_proc.h linux-3.7-vs2.3.5.1/ + int a, b, c; + + length += sprintf(buffer + length, -+ "BiasUptime:\t%lu.%02lu\n", -+ (unsigned long)cvirt->bias_uptime.tv_sec, ++ "BiasUptime:\t%llu.%02lu\n", ++ (unsigned long long)cvirt->bias_uptime.tv_sec, + (cvirt->bias_uptime.tv_nsec / (NSEC_PER_SEC / 100))); + + a = cvirt->load[0] + (FIXED_1 / 200); @@ -17292,14 +16258,14 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/cvirt_proc.h linux-3.7-vs2.3.5.1/ +} + +#endif /* _VX_CVIRT_PROC_H */ -diff -NurpP --minimal linux-3.7/kernel/vserver/debug.c linux-3.7-vs2.3.5.1/kernel/vserver/debug.c ---- linux-3.7/kernel/vserver/debug.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/debug.c 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/debug.c linux-4.9/kernel/vserver/debug.c +--- linux-4.9/kernel/vserver/debug.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/debug.c 2021-02-24 15:47:45.121077159 +0100 @@ -0,0 +1,32 @@ +/* + * kernel/vserver/debug.c + * -+ * Copyright (C) 2005-2007 Herbert Pötzl ++ * Copyright (C) 2005-2007 Herbert P?tzl + * + * V0.01 vx_info dump support + * @@ -17328,16 +16294,16 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/debug.c linux-3.7-vs2.3.5.1/kerne + +EXPORT_SYMBOL_GPL(dump_vx_info); + -diff -NurpP --minimal linux-3.7/kernel/vserver/device.c linux-3.7-vs2.3.5.1/kernel/vserver/device.c ---- linux-3.7/kernel/vserver/device.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/device.c 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/device.c linux-4.9/kernel/vserver/device.c +--- linux-4.9/kernel/vserver/device.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/device.c 2021-02-24 15:47:45.121077159 +0100 @@ -0,0 +1,443 @@ +/* + * linux/kernel/vserver/device.c + * + * Linux-VServer: Device Support + * -+ * Copyright (C) 2006 Herbert Pötzl ++ * Copyright (C) 2006 Herbert P?tzl + * Copyright (C) 2007 Daniel Hokka Zakrisson + * + * V0.01 device mapping basics @@ -17370,7 +16336,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/device.c linux-3.7-vs2.3.5.1/kern + } u; +#define dm_hlist u.hlist +#define dm_list u.list -+ xid_t xid; ++ vxid_t xid; + dev_t device; + struct vx_dmap_target target; +}; @@ -17482,7 +16448,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/device.c linux-3.7-vs2.3.5.1/kern + * + * caller must hold hash_lock + */ -+static inline int __find_mapping(xid_t xid, dev_t device, umode_t mode, ++static inline int __find_mapping(vxid_t xid, dev_t device, umode_t mode, + struct vs_mapping **local, struct vs_mapping **global) +{ + struct hlist_head *hash = dmap_main_hash; @@ -17524,7 +16490,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/device.c linux-3.7-vs2.3.5.1/kern + struct vs_mapping *vdm, *global; + struct vx_dmap_target *vdmt; + int ret = 0; -+ xid_t xid = vxi->vx_id; ++ vxid_t xid = vxi->vx_id; + int index; + + spin_lock(hash_lock); @@ -17661,21 +16627,21 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/device.c linux-3.7-vs2.3.5.1/kern +static inline int __user_device(const char __user *name, dev_t *dev, + umode_t *mode) +{ -+ struct nameidata nd; ++ struct path path; + int ret; + + if (!name) { + *dev = 0; + return 0; + } -+ ret = user_lpath(name, &nd.path); ++ ret = user_lpath(name, &path); + if (ret) + return ret; -+ if (nd.path.dentry->d_inode) { -+ *dev = nd.path.dentry->d_inode->i_rdev; -+ *mode = nd.path.dentry->d_inode->i_mode; ++ if (path.dentry->d_inode) { ++ *dev = path.dentry->d_inode->i_rdev; ++ *mode = path.dentry->d_inode->i_mode; + } -+ path_put(&nd.path); ++ path_put(&path); + return 0; +} + @@ -17775,16 +16741,16 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/device.c linux-3.7-vs2.3.5.1/kern +#endif /* CONFIG_COMPAT */ + + -diff -NurpP --minimal linux-3.7/kernel/vserver/dlimit.c linux-3.7-vs2.3.5.1/kernel/vserver/dlimit.c ---- linux-3.7/kernel/vserver/dlimit.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/dlimit.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,531 @@ +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/dlimit.c linux-4.9/kernel/vserver/dlimit.c +--- linux-4.9/kernel/vserver/dlimit.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/dlimit.c 2021-02-24 15:47:45.121077159 +0100 +@@ -0,0 +1,528 @@ +/* + * linux/kernel/vserver/dlimit.c + * + * Virtual Server: Context Disk Limits + * -+ * Copyright (C) 2004-2009 Herbert Pötzl ++ * Copyright (C) 2004-2009 Herbert P?tzl + * + * V0.01 initial version + * V0.02 compat32 splitup @@ -17808,7 +16774,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/dlimit.c linux-3.7-vs2.3.5.1/kern + * allocate an initialized dl_info struct + * doesn't make it visible (hash) */ + -+static struct dl_info *__alloc_dl_info(struct super_block *sb, tag_t tag) ++static struct dl_info *__alloc_dl_info(struct super_block *sb, vtag_t tag) +{ + struct dl_info *new = NULL; + @@ -17865,7 +16831,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/dlimit.c linux-3.7-vs2.3.5.1/kern +static DEFINE_SPINLOCK(dl_info_hash_lock); + + -+static inline unsigned int __hashval(struct super_block *sb, tag_t tag) ++static inline unsigned int __hashval(struct super_block *sb, vtag_t tag) +{ + return ((tag ^ (unsigned long)sb) % DL_HASH_SIZE); +} @@ -17907,23 +16873,20 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/dlimit.c linux-3.7-vs2.3.5.1/kern + * requires the rcu_read_lock() + * doesn't increment the dl_refcnt */ + -+static inline struct dl_info *__lookup_dl_info(struct super_block *sb, tag_t tag) ++static inline struct dl_info *__lookup_dl_info(struct super_block *sb, vtag_t tag) +{ + struct hlist_head *head = &dl_info_hash[__hashval(sb, tag)]; -+ struct hlist_node *pos; + struct dl_info *dli; + -+ hlist_for_each_entry_rcu(dli, pos, head, dl_hlist) { -+ -+ if (dli->dl_tag == tag && dli->dl_sb == sb) { ++ hlist_for_each_entry_rcu(dli, head, dl_hlist) { ++ if (dli->dl_tag == tag && dli->dl_sb == sb) + return dli; -+ } + } + return NULL; +} + + -+struct dl_info *locate_dl_info(struct super_block *sb, tag_t tag) ++struct dl_info *locate_dl_info(struct super_block *sb, vtag_t tag) +{ + struct dl_info *dli; + @@ -18310,16 +17273,16 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/dlimit.c linux-3.7-vs2.3.5.1/kern +EXPORT_SYMBOL_GPL(locate_dl_info); +EXPORT_SYMBOL_GPL(rcu_free_dl_info); + -diff -NurpP --minimal linux-3.7/kernel/vserver/helper.c linux-3.7-vs2.3.5.1/kernel/vserver/helper.c ---- linux-3.7/kernel/vserver/helper.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/helper.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,229 @@ +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/helper.c linux-4.9/kernel/vserver/helper.c +--- linux-4.9/kernel/vserver/helper.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/helper.c 2021-02-24 15:47:45.124410596 +0100 +@@ -0,0 +1,242 @@ +/* + * linux/kernel/vserver/helper.c + * + * Virtual Context Support + * -+ * Copyright (C) 2004-2007 Herbert Pötzl ++ * Copyright (C) 2004-2007 Herbert P?tzl + * + * V0.01 basic helper + * @@ -18336,17 +17299,29 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/helper.c linux-3.7-vs2.3.5.1/kern + +static int vshelper_init(struct subprocess_info *info, struct cred *new_cred) +{ -+ current->flags &= ~PF_THREAD_BOUND; ++ current->flags &= ~PF_NO_SETAFFINITY; + return 0; +} + ++static int vs_call_usermodehelper(char *path, char **argv, char **envp, int wait) ++{ ++ struct subprocess_info *info; ++ gfp_t gfp_mask = (wait == UMH_NO_WAIT) ? GFP_ATOMIC : GFP_KERNEL; ++ ++ info = call_usermodehelper_setup(path, argv, envp, gfp_mask, ++ vshelper_init, NULL, NULL); ++ if (info == NULL) ++ return -ENOMEM; ++ ++ return call_usermodehelper_exec(info, wait); ++} ++ +static int do_vshelper(char *name, char *argv[], char *envp[], int sync) +{ + int ret; + -+ if ((ret = call_usermodehelper_fns(name, argv, envp, -+ sync ? UMH_WAIT_PROC : UMH_WAIT_EXEC, -+ vshelper_init, NULL, NULL))) { ++ if ((ret = vs_call_usermodehelper(name, argv, envp, ++ sync ? UMH_WAIT_PROC : UMH_WAIT_EXEC))) { + printk(KERN_WARNING "%s: (%s %s) returned %s with %d\n", + name, argv[1], argv[2], + sync ? "sync" : "async", ret); @@ -18387,7 +17362,8 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/helper.c linux-3.7-vs2.3.5.1/kern + snprintf(id_buf, sizeof(id_buf), "%d", vxi->vx_id); + + snprintf(cmd_buf, sizeof(cmd_buf), "VS_CMD=%08x", cmd); -+ snprintf(uid_buf, sizeof(uid_buf), "VS_UID=%d", current_uid()); ++ snprintf(uid_buf, sizeof(uid_buf), "VS_UID=%d", ++ from_kuid(&init_user_ns, current_uid())); + snprintf(pid_buf, sizeof(pid_buf), "VS_PID=%d", current->pid); + + switch (cmd) { @@ -18543,16 +17519,16 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/helper.c linux-3.7-vs2.3.5.1/kern + return do_vshelper(vshelper_path, argv, envp, 1); +} + -diff -NurpP --minimal linux-3.7/kernel/vserver/history.c linux-3.7-vs2.3.5.1/kernel/vserver/history.c ---- linux-3.7/kernel/vserver/history.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/history.c 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/history.c linux-4.9/kernel/vserver/history.c +--- linux-4.9/kernel/vserver/history.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/history.c 2021-02-24 15:47:45.124410596 +0100 @@ -0,0 +1,258 @@ +/* + * kernel/vserver/history.c + * + * Virtual Context History Backtrace + * -+ * Copyright (C) 2004-2007 Herbert Pötzl ++ * Copyright (C) 2004-2007 Herbert P?tzl + * + * V0.01 basic structure + * V0.02 hash/unhash and trace @@ -18805,10 +17781,10 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/history.c linux-3.7-vs2.3.5.1/ker + +#endif /* CONFIG_COMPAT */ + -diff -NurpP --minimal linux-3.7/kernel/vserver/inet.c linux-3.7-vs2.3.5.1/kernel/vserver/inet.c ---- linux-3.7/kernel/vserver/inet.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/inet.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,226 @@ +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/inet.c linux-4.9/kernel/vserver/inet.c +--- linux-4.9/kernel/vserver/inet.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/inet.c 2021-02-24 15:47:45.124410596 +0100 +@@ -0,0 +1,236 @@ + +#include +#include @@ -18828,13 +17804,16 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/inet.c linux-3.7-vs2.3.5.1/kernel + ret = 1; + else { + struct nx_addr_v4 *ptr; ++ unsigned long irqflags; + ++ spin_lock_irqsave(&nxi1->addr_lock, irqflags); + for (ptr = &nxi1->v4; ptr; ptr = ptr->next) { + if (v4_nx_addr_in_nx_info(nxi2, ptr, -1)) { + ret = 1; + break; + } + } ++ spin_unlock_irqrestore(&nxi1->addr_lock, irqflags); + } + + vxdprintk(VXD_CBIT(net, 2), @@ -18855,13 +17834,16 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/inet.c linux-3.7-vs2.3.5.1/kernel + ret = 1; + else { + struct nx_addr_v6 *ptr; ++ unsigned long irqflags; + ++ spin_lock_irqsave(&nxi1->addr_lock, irqflags); + for (ptr = &nxi1->v6; ptr; ptr = ptr->next) { + if (v6_nx_addr_in_nx_info(nxi2, ptr, -1)) { + ret = 1; + break; + } + } ++ spin_unlock_irqrestore(&nxi1->addr_lock, irqflags); + } + + vxdprintk(VXD_CBIT(net, 2), @@ -18985,6 +17967,8 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/inet.c linux-3.7-vs2.3.5.1/kernel + goto found; + } + ++ WARN_ON_ONCE(in_irq()); ++ spin_lock_bh(&nxi->addr_lock); + for (ptr = &nxi->v4; ptr; ptr = ptr->next) { + __be32 primary = ptr->ip[0].s_addr; + __be32 mask = ptr->mask.s_addr; @@ -19006,12 +17990,14 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/inet.c linux-3.7-vs2.3.5.1/kernel + found = fl4->saddr; + ip_rt_put(rt); + if (found == primary) -+ goto found; ++ goto found_unlock; + } + } + /* still no source ip? */ + found = ipv4_is_loopback(fl4->daddr) + ? IPI_LOOPBACK : nxi->v4.ip[0].s_addr; ++ found_unlock: ++ spin_unlock_bh(&nxi->addr_lock); + found: + /* assign src ip to flow */ + fl4->saddr = found; @@ -19035,22 +18021,23 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/inet.c linux-3.7-vs2.3.5.1/kernel + +EXPORT_SYMBOL_GPL(ip_v4_find_src); + -diff -NurpP --minimal linux-3.7/kernel/vserver/init.c linux-3.7-vs2.3.5.1/kernel/vserver/init.c ---- linux-3.7/kernel/vserver/init.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/init.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,45 @@ +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/init.c linux-4.9/kernel/vserver/init.c +--- linux-4.9/kernel/vserver/init.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/init.c 2021-02-24 15:47:45.124410596 +0100 +@@ -0,0 +1,46 @@ +/* + * linux/kernel/init.c + * + * Virtual Server Init + * -+ * Copyright (C) 2004-2007 Herbert Pötzl ++ * Copyright (C) 2004-2007 Herbert P?tzl + * + * V0.01 basic structure + * + */ + +#include ++#include + +int vserver_register_sysctl(void); +void vserver_unregister_sysctl(void); @@ -19084,16 +18071,16 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/init.c linux-3.7-vs2.3.5.1/kernel +module_init(init_vserver); +module_exit(exit_vserver); + -diff -NurpP --minimal linux-3.7/kernel/vserver/inode.c linux-3.7-vs2.3.5.1/kernel/vserver/inode.c ---- linux-3.7/kernel/vserver/inode.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/inode.c 2012-12-11 19:38:12.000000000 +0000 -@@ -0,0 +1,437 @@ +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/inode.c linux-4.9/kernel/vserver/inode.c +--- linux-4.9/kernel/vserver/inode.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/inode.c 2021-02-24 15:47:45.124410596 +0100 +@@ -0,0 +1,440 @@ +/* + * linux/kernel/vserver/inode.c + * + * Virtual Server: File System Support + * -+ * Copyright (C) 2004-2007 Herbert Pötzl ++ * Copyright (C) 2004-2007 Herbert P?tzl + * + * V0.01 separated from vcontext V0.05 + * V0.02 moved to tag (instead of xid) @@ -19108,12 +18095,15 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/inode.c linux-3.7-vs2.3.5.1/kerne +#include +#include +#include ++#include ++#include +#include +#include +#include +#include + +#include ++#include <../../fs/proc/internal.h> + + +static int __vc_get_iattr(struct inode *in, uint32_t *tag, uint32_t *flags, uint32_t *mask) @@ -19223,10 +18213,10 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/inode.c linux-3.7-vs2.3.5.1/kerne + return -EFAULT; + + filp = fget(fd); -+ if (!filp || !filp->f_dentry || !filp->f_dentry->d_inode) ++ if (!filp || !filp->f_path.dentry || !filp->f_path.dentry->d_inode) + return -EBADF; + -+ ret = __vc_get_iattr(filp->f_dentry->d_inode, ++ ret = __vc_get_iattr(filp->f_path.dentry->d_inode, + &vc_data.tag, &vc_data.flags, &vc_data.mask); + + fput(filp); @@ -19255,9 +18245,9 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/inode.c linux-3.7-vs2.3.5.1/kerne + if ((*mask & IATTR_TAG) && !has_tag) + return -EINVAL; + -+ mutex_lock(&in->i_mutex); ++ inode_lock(in); + if (*mask & IATTR_TAG) { -+ attr.ia_tag = *tag; ++ attr.ia_tag = make_ktag(&init_user_ns, *tag); + attr.ia_valid |= ATTR_TAG; + } + @@ -19312,7 +18302,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/inode.c linux-3.7-vs2.3.5.1/kerne + if (in->i_op && in->i_op->setattr) + error = in->i_op->setattr(de, &attr); + else { -+ error = inode_change_ok(in, &attr); ++ error = setattr_prepare(de, &attr); + if (!error) { + setattr_copy(in, &attr); + mark_inode_dirty(in); @@ -19321,7 +18311,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/inode.c linux-3.7-vs2.3.5.1/kerne + } + +out: -+ mutex_unlock(&in->i_mutex); ++ inode_unlock(in); + return error; +} + @@ -19387,10 +18377,10 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/inode.c linux-3.7-vs2.3.5.1/kerne + return -EFAULT; + + filp = fget(fd); -+ if (!filp || !filp->f_dentry || !filp->f_dentry->d_inode) ++ if (!filp || !filp->f_path.dentry || !filp->f_path.dentry->d_inode) + return -EBADF; + -+ ret = __vc_set_iattr(filp->f_dentry, &vc_data.tag, ++ ret = __vc_set_iattr(filp->f_path.dentry, &vc_data.tag, + &vc_data.flags, &vc_data.mask); + + fput(filp); @@ -19429,7 +18419,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/inode.c linux-3.7-vs2.3.5.1/kerne + } +} + -+int dx_parse_tag(char *string, tag_t *tag, int remove, int *mnt_flags, ++int dx_parse_tag(char *string, vtag_t *tag, int remove, int *mnt_flags, + unsigned long *flags) +{ + int set = 0; @@ -19496,7 +18486,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/inode.c linux-3.7-vs2.3.5.1/kerne + +void __dx_propagate_tag(struct nameidata *nd, struct inode *inode) +{ -+ tag_t new_tag = 0; ++ vtag_t new_tag = 0; + struct vfsmount *mnt; + int propagate; + @@ -19525,16 +18515,16 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/inode.c linux-3.7-vs2.3.5.1/kerne + +#endif /* CONFIG_PROPAGATE */ + -diff -NurpP --minimal linux-3.7/kernel/vserver/limit.c linux-3.7-vs2.3.5.1/kernel/vserver/limit.c ---- linux-3.7/kernel/vserver/limit.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/limit.c 2012-12-12 13:08:45.000000000 +0000 -@@ -0,0 +1,345 @@ +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/limit.c linux-4.9/kernel/vserver/limit.c +--- linux-4.9/kernel/vserver/limit.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/limit.c 2021-02-24 15:47:45.124410596 +0100 +@@ -0,0 +1,386 @@ +/* + * linux/kernel/vserver/limit.c + * + * Virtual Server: Context Limits + * -+ * Copyright (C) 2004-2010 Herbert Pötzl ++ * Copyright (C) 2004-2010 Herbert P?tzl + * + * V0.01 broken out from vcontext V0.05 + * V0.02 changed vcmds to vxi arg @@ -19545,7 +18535,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/limit.c linux-3.7-vs2.3.5.1/kerne +#include +#include +#include -+#include ++#include +#include +#include +#include @@ -19786,59 +18776,95 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/limit.c linux-3.7-vs2.3.5.1/kerne +} + + ++#ifdef CONFIG_MEMCG ++ ++void dump_sysinfo(struct sysinfo *si) ++{ ++ printk(KERN_INFO "sysinfo: memunit=%u\n" ++ "\ttotalram:\t%lu\n" ++ "\tfreeram:\t%lu\n" ++ "\tsharedram:\t%lu\n" ++ "\tbufferram:\t%lu\n" ++ "\ttotalswap:\t%lu\n" ++ "\tfreeswap:\t%lu\n" ++ "\ttotalhigh:\t%lu\n" ++ "\tfreehigh:\t%lu\n", ++ si->mem_unit, ++ si->totalram, ++ si->freeram, ++ si->sharedram, ++ si->bufferram, ++ si->totalswap, ++ si->freeswap, ++ si->totalhigh, ++ si->freehigh); ++} ++ +void vx_vsi_meminfo(struct sysinfo *val) +{ -+#ifdef CONFIG_MEMCG + struct mem_cgroup *mcg; -+ u64 res_limit, res_usage; ++ unsigned long res_limit, res_usage; ++ unsigned shift; ++ ++ if (VXD_CBIT(cvirt, 4)) ++ dump_sysinfo(val); + + rcu_read_lock(); + mcg = mem_cgroup_from_task(current); ++ if (VXD_CBIT(cvirt, 5)) ++ dump_mem_cgroup(mcg); + rcu_read_unlock(); + if (!mcg) + goto out; + -+ res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT); -+ res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE); ++ res_limit = mem_cgroup_mem_limit_pages(mcg); ++ res_usage = mem_cgroup_mem_usage_pages(mcg); ++ shift = val->mem_unit == 1 ? PAGE_SHIFT : 0; + -+ if (res_limit != RESOURCE_MAX) -+ val->totalram = (res_limit >> PAGE_SHIFT); -+ val->freeram = val->totalram - (res_usage >> PAGE_SHIFT); ++ if (res_limit != PAGE_COUNTER_MAX) ++ val->totalram = res_limit << shift; ++ val->freeram = val->totalram - (res_usage << shift); + val->bufferram = 0; + val->totalhigh = 0; + val->freehigh = 0; +out: -+#endif /* CONFIG_MEMCG */ + return; +} + +void vx_vsi_swapinfo(struct sysinfo *val) +{ -+#ifdef CONFIG_MEMCG +#ifdef CONFIG_MEMCG_SWAP + struct mem_cgroup *mcg; -+ u64 res_limit, res_usage, memsw_limit, memsw_usage; -+ s64 swap_limit, swap_usage; ++ unsigned long res_limit, res_usage, memsw_limit, memsw_usage; ++ signed long swap_limit, swap_usage; ++ unsigned shift; ++ ++ if (VXD_CBIT(cvirt, 6)) ++ dump_sysinfo(val); + + rcu_read_lock(); + mcg = mem_cgroup_from_task(current); ++ if (VXD_CBIT(cvirt, 7)) ++ dump_mem_cgroup(mcg); + rcu_read_unlock(); + if (!mcg) + goto out; + -+ res_limit = mem_cgroup_res_read_u64(mcg, RES_LIMIT); -+ res_usage = mem_cgroup_res_read_u64(mcg, RES_USAGE); -+ memsw_limit = mem_cgroup_memsw_read_u64(mcg, RES_LIMIT); -+ memsw_usage = mem_cgroup_memsw_read_u64(mcg, RES_USAGE); ++ res_limit = mem_cgroup_mem_limit_pages(mcg); + + /* memory unlimited */ -+ if (res_limit == RESOURCE_MAX) ++ if (res_limit == PAGE_COUNTER_MAX) + goto out; + ++ res_usage = mem_cgroup_mem_usage_pages(mcg); ++ memsw_limit = mem_cgroup_memsw_limit_pages(mcg); ++ memsw_usage = mem_cgroup_memsw_usage_pages(mcg); ++ shift = val->mem_unit == 1 ? PAGE_SHIFT : 0; ++ + swap_limit = memsw_limit - res_limit; + /* we have a swap limit? */ -+ if (memsw_limit != RESOURCE_MAX) -+ val->totalswap = swap_limit >> PAGE_SHIFT; ++ if (memsw_limit != PAGE_COUNTER_MAX) ++ val->totalswap = swap_limit << shift; + + /* calculate swap part */ + swap_usage = (memsw_usage > res_usage) ? @@ -19846,37 +18872,42 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/limit.c linux-3.7-vs2.3.5.1/kerne + + /* total shown minus usage gives free swap */ + val->freeswap = (swap_usage < swap_limit) ? -+ val->totalswap - (swap_usage >> PAGE_SHIFT) : 0; ++ val->totalswap - (swap_usage << shift) : 0; +out: +#else /* !CONFIG_MEMCG_SWAP */ + val->totalswap = 0; + val->freeswap = 0; +#endif /* !CONFIG_MEMCG_SWAP */ -+#endif /* CONFIG_MEMCG */ + return; +} + +long vx_vsi_cached(struct sysinfo *val) +{ + long cache = 0; -+#ifdef CONFIG_MEMCG ++#ifdef CONFIG_MEMCG_BROKEN + struct mem_cgroup *mcg; + ++ if (VXD_CBIT(cvirt, 8)) ++ dump_sysinfo(val); ++ + rcu_read_lock(); + mcg = mem_cgroup_from_task(current); ++ if (VXD_CBIT(cvirt, 9)) ++ dump_mem_cgroup(mcg); + rcu_read_unlock(); + if (!mcg) + goto out; + -+ cache = mem_cgroup_stat_read_cache(mcg); ++ // cache = mem_cgroup_stat_read_cache(mcg); +out: +#endif + return cache; +} ++#endif /* !CONFIG_MEMCG */ + -diff -NurpP --minimal linux-3.7/kernel/vserver/limit_init.h linux-3.7-vs2.3.5.1/kernel/vserver/limit_init.h ---- linux-3.7/kernel/vserver/limit_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/limit_init.h 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/limit_init.h linux-4.9/kernel/vserver/limit_init.h +--- linux-4.9/kernel/vserver/limit_init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/limit_init.h 2021-02-24 15:47:45.124410596 +0100 @@ -0,0 +1,31 @@ + + @@ -19909,9 +18940,9 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/limit_init.h linux-3.7-vs2.3.5.1/ + } +} + -diff -NurpP --minimal linux-3.7/kernel/vserver/limit_proc.h linux-3.7-vs2.3.5.1/kernel/vserver/limit_proc.h ---- linux-3.7/kernel/vserver/limit_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/limit_proc.h 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/limit_proc.h linux-4.9/kernel/vserver/limit_proc.h +--- linux-4.9/kernel/vserver/limit_proc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/limit_proc.h 2021-02-24 15:47:45.124410596 +0100 @@ -0,0 +1,57 @@ +#ifndef _VX_LIMIT_PROC_H +#define _VX_LIMIT_PROC_H @@ -19970,16 +19001,16 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/limit_proc.h linux-3.7-vs2.3.5.1/ +#endif /* _VX_LIMIT_PROC_H */ + + -diff -NurpP --minimal linux-3.7/kernel/vserver/network.c linux-3.7-vs2.3.5.1/kernel/vserver/network.c ---- linux-3.7/kernel/vserver/network.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/network.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,912 @@ +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/network.c linux-4.9/kernel/vserver/network.c +--- linux-4.9/kernel/vserver/network.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/network.c 2021-02-24 15:47:45.124410596 +0100 +@@ -0,0 +1,1053 @@ +/* + * linux/kernel/vserver/network.c + * + * Virtual Server: Network Support + * -+ * Copyright (C) 2003-2007 Herbert Pötzl ++ * Copyright (C) 2003-2007 Herbert P?tzl + * + * V0.01 broken out from vcontext V0.05 + * V0.02 cleaned up implementation @@ -19994,6 +19025,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/network.c linux-3.7-vs2.3.5.1/ker +#include +#include +#include ++#include + +#include +#include @@ -20091,7 +19123,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/network.c linux-3.7-vs2.3.5.1/ker + * allocate an initialized nx_info struct + * doesn't make it visible (hash) */ + -+static struct nx_info *__alloc_nx_info(nid_t nid) ++static struct nx_info *__alloc_nx_info(vnid_t nid) +{ + struct nx_info *new = NULL; + @@ -20107,6 +19139,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/network.c linux-3.7-vs2.3.5.1/ker + INIT_HLIST_NODE(&new->nx_hlist); + atomic_set(&new->nx_usecnt, 0); + atomic_set(&new->nx_tasks, 0); ++ spin_lock_init(&new->addr_lock); + new->nx_state = 0; + + new->nx_flags = NXF_INIT_SET; @@ -20138,6 +19171,9 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/network.c linux-3.7-vs2.3.5.1/ker + BUG_ON(atomic_read(&nxi->nx_tasks)); + + __dealloc_nx_addr_v4_all(nxi->v4.next); ++#ifdef CONFIG_IPV6 ++ __dealloc_nx_addr_v6_all(nxi->v6.next); ++#endif + + nxi->nx_state |= NXS_RELEASED; + kfree(nxi); @@ -20188,7 +19224,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/network.c linux-3.7-vs2.3.5.1/ker +static DEFINE_SPINLOCK(nx_info_hash_lock); + + -+static inline unsigned int __hashval(nid_t nid) ++static inline unsigned int __hashval(vnid_t nid) +{ + return (nid % NX_HASH_SIZE); +} @@ -20245,7 +19281,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/network.c linux-3.7-vs2.3.5.1/ker + * requires the hash_lock to be held + * doesn't increment the nx_refcnt */ + -+static inline struct nx_info *__lookup_nx_info(nid_t nid) ++static inline struct nx_info *__lookup_nx_info(vnid_t nid) +{ + struct hlist_head *head = &nx_info_hash[__hashval(nid)]; + struct hlist_node *pos; @@ -20345,7 +19381,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/network.c linux-3.7-vs2.3.5.1/ker + + * verify that nid is still hashed */ + -+int nid_is_hashed(nid_t nid) ++int nid_is_hashed(vnid_t nid) +{ + int hashed; + @@ -20489,7 +19525,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/network.c linux-3.7-vs2.3.5.1/ker + +int vc_task_nid(uint32_t id) +{ -+ nid_t nid; ++ vnid_t nid; + + if (id) { + struct task_struct *tsk; @@ -20564,52 +19600,108 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/network.c linux-3.7-vs2.3.5.1/ker +} + + ++static inline ++struct nx_addr_v4 *__find_v4_addr(struct nx_info *nxi, ++ __be32 ip, __be32 ip2, __be32 mask, uint16_t type, uint16_t flags, ++ struct nx_addr_v4 **prev) ++{ ++ struct nx_addr_v4 *nxa = &nxi->v4; ++ ++ for (; nxa; nxa = nxa->next) { ++ if ((nxa->ip[0].s_addr == ip) && ++ (nxa->ip[1].s_addr == ip2) && ++ (nxa->mask.s_addr == mask) && ++ (nxa->type == type) && ++ (nxa->flags == flags)) ++ return nxa; ++ ++ /* save previous entry */ ++ if (prev) ++ *prev = nxa; ++ } ++ return NULL; ++} + +int do_add_v4_addr(struct nx_info *nxi, __be32 ip, __be32 ip2, __be32 mask, + uint16_t type, uint16_t flags) +{ -+ struct nx_addr_v4 *nxa = &nxi->v4; ++ struct nx_addr_v4 *nxa = NULL; ++ struct nx_addr_v4 *new = __alloc_nx_addr_v4(); ++ unsigned long irqflags; ++ int ret = -EEXIST; + -+ if (NX_IPV4(nxi)) { -+ /* locate last entry */ -+ for (; nxa->next; nxa = nxa->next); -+ nxa->next = __alloc_nx_addr_v4(); -+ nxa = nxa->next; ++ if (IS_ERR(new)) ++ return PTR_ERR(new); + -+ if (IS_ERR(nxa)) -+ return PTR_ERR(nxa); -+ } ++ spin_lock_irqsave(&nxi->addr_lock, irqflags); ++ if (__find_v4_addr(nxi, ip, ip2, mask, type, flags, &nxa)) ++ goto out_unlock; ++ ++ if (NX_IPV4(nxi)) { ++ nxa->next = new; ++ nxa = new; ++ new = NULL; + -+ if (nxi->v4.next) + /* remove single ip for ip list */ + nxi->nx_flags &= ~NXF_SINGLE_IP; ++ } + + nxa->ip[0].s_addr = ip; + nxa->ip[1].s_addr = ip2; + nxa->mask.s_addr = mask; + nxa->type = type; + nxa->flags = flags; -+ return 0; ++ ret = 0; ++out_unlock: ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); ++ if (new) ++ __dealloc_nx_addr_v4(new); ++ return ret; +} + +int do_remove_v4_addr(struct nx_info *nxi, __be32 ip, __be32 ip2, __be32 mask, + uint16_t type, uint16_t flags) +{ -+ struct nx_addr_v4 *nxa = &nxi->v4; ++ struct nx_addr_v4 *nxa = NULL; ++ struct nx_addr_v4 *old = NULL; ++ unsigned long irqflags; ++ int ret = 0; + ++ spin_lock_irqsave(&nxi->addr_lock, irqflags); + switch (type) { -+/* case NXA_TYPE_ADDR: -+ break; */ ++ case NXA_TYPE_ADDR: ++ old = __find_v4_addr(nxi, ip, ip2, mask, type, flags, &nxa); ++ if (old) { ++ if (nxa) { ++ nxa->next = old->next; ++ old->next = NULL; ++ } else { ++ if (old->next) { ++ nxa = old; ++ old = old->next; ++ *nxa = *old; ++ old->next = NULL; ++ } else { ++ memset(old, 0, sizeof(*old)); ++ old = NULL; ++ } ++ } ++ } else ++ ret = -ESRCH; ++ break; + + case NXA_TYPE_ANY: -+ __dealloc_nx_addr_v4_all(xchg(&nxa->next, NULL)); ++ nxa = &nxi->v4; ++ old = nxa->next; + memset(nxa, 0, sizeof(*nxa)); + break; + + default: -+ return -EINVAL; ++ ret = -EINVAL; + } -+ return 0; ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); ++ __dealloc_nx_addr_v4_all(old); ++ return ret; +} + + @@ -20663,10 +19755,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/network.c linux-3.7-vs2.3.5.1/ker + + switch (vc_data.type) { + case NXA_TYPE_ANY: -+ __dealloc_nx_addr_v4_all(xchg(&nxi->v4.next, NULL)); -+ memset(&nxi->v4, 0, sizeof(nxi->v4)); -+ break; -+ ++ return do_remove_v4_addr(nxi, 0, 0, 0, vc_data.type, 0); + default: + return -EINVAL; + } @@ -20747,26 +19836,56 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/network.c linux-3.7-vs2.3.5.1/ker + if (data && copy_from_user(&vc_data, data, sizeof(vc_data))) + return -EFAULT; + -+ return do_remove_v4_addr(nxi, vc_data.ip.s_addr, vc_data.ip2.s_addr, -+ vc_data.mask.s_addr, vc_data.type, vc_data.flags); ++ return do_remove_v4_addr(nxi, vc_data.ip.s_addr, vc_data.ip2.s_addr, ++ vc_data.mask.s_addr, vc_data.type, vc_data.flags); ++} ++ ++#ifdef CONFIG_IPV6 ++ ++static inline ++struct nx_addr_v6 *__find_v6_addr(struct nx_info *nxi, ++ struct in6_addr *ip, struct in6_addr *mask, ++ uint32_t prefix, uint16_t type, uint16_t flags, ++ struct nx_addr_v6 **prev) ++{ ++ struct nx_addr_v6 *nxa = &nxi->v6; ++ ++ for (; nxa; nxa = nxa->next) { ++ if (ipv6_addr_equal(&nxa->ip, ip) && ++ ipv6_addr_equal(&nxa->mask, mask) && ++ (nxa->prefix == prefix) && ++ (nxa->type == type) && ++ (nxa->flags == flags)) ++ return nxa; ++ ++ /* save previous entry */ ++ if (prev) ++ *prev = nxa; ++ } ++ return NULL; +} + -+#ifdef CONFIG_IPV6 + +int do_add_v6_addr(struct nx_info *nxi, + struct in6_addr *ip, struct in6_addr *mask, + uint32_t prefix, uint16_t type, uint16_t flags) +{ -+ struct nx_addr_v6 *nxa = &nxi->v6; ++ struct nx_addr_v6 *nxa = NULL; ++ struct nx_addr_v6 *new = __alloc_nx_addr_v6(); ++ unsigned long irqflags; ++ int ret = -EEXIST; + -+ if (NX_IPV6(nxi)) { -+ /* locate last entry */ -+ for (; nxa->next; nxa = nxa->next); -+ nxa->next = __alloc_nx_addr_v6(); -+ nxa = nxa->next; ++ if (IS_ERR(new)) ++ return PTR_ERR(new); ++ ++ spin_lock_irqsave(&nxi->addr_lock, irqflags); ++ if (__find_v6_addr(nxi, ip, mask, prefix, type, flags, &nxa)) ++ goto out_unlock; + -+ if (IS_ERR(nxa)) -+ return PTR_ERR(nxa); ++ if (NX_IPV6(nxi)) { ++ nxa->next = new; ++ nxa = new; ++ new = NULL; + } + + nxa->ip = *ip; @@ -20774,9 +19893,59 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/network.c linux-3.7-vs2.3.5.1/ker + nxa->prefix = prefix; + nxa->type = type; + nxa->flags = flags; -+ return 0; ++ ret = 0; ++out_unlock: ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); ++ if (new) ++ __dealloc_nx_addr_v6(new); ++ return ret; +} + ++int do_remove_v6_addr(struct nx_info *nxi, ++ struct in6_addr *ip, struct in6_addr *mask, ++ uint32_t prefix, uint16_t type, uint16_t flags) ++{ ++ struct nx_addr_v6 *nxa = NULL; ++ struct nx_addr_v6 *old = NULL; ++ unsigned long irqflags; ++ int ret = 0; ++ ++ spin_lock_irqsave(&nxi->addr_lock, irqflags); ++ switch (type) { ++ case NXA_TYPE_ADDR: ++ old = __find_v6_addr(nxi, ip, mask, prefix, type, flags, &nxa); ++ if (old) { ++ if (nxa) { ++ nxa->next = old->next; ++ old->next = NULL; ++ } else { ++ if (old->next) { ++ nxa = old; ++ old = old->next; ++ *nxa = *old; ++ old->next = NULL; ++ } else { ++ memset(old, 0, sizeof(*old)); ++ old = NULL; ++ } ++ } ++ } else ++ ret = -ESRCH; ++ break; ++ ++ case NXA_TYPE_ANY: ++ nxa = &nxi->v6; ++ old = nxa->next; ++ memset(nxa, 0, sizeof(*nxa)); ++ break; ++ ++ default: ++ ret = -EINVAL; ++ } ++ spin_unlock_irqrestore(&nxi->addr_lock, irqflags); ++ __dealloc_nx_addr_v6_all(old); ++ return ret; ++} + +int vc_net_add_ipv6(struct nx_info *nxi, void __user *data) +{ @@ -20806,11 +19975,14 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/network.c linux-3.7-vs2.3.5.1/ker + return -EFAULT; + + switch (vc_data.type) { ++ case NXA_TYPE_ADDR: ++ memset(&vc_data.mask, ~0, sizeof(vc_data.mask)); ++ /* fallthrough */ ++ case NXA_TYPE_MASK: ++ return do_remove_v6_addr(nxi, &vc_data.ip, &vc_data.mask, ++ vc_data.prefix, vc_data.type, vc_data.flags); + case NXA_TYPE_ANY: -+ __dealloc_nx_addr_v6_all(xchg(&nxi->v6.next, NULL)); -+ memset(&nxi->v6, 0, sizeof(nxi->v6)); -+ break; -+ ++ return do_remove_v6_addr(nxi, NULL, NULL, 0, vc_data.type, 0); + default: + return -EINVAL; + } @@ -20886,16 +20058,16 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/network.c linux-3.7-vs2.3.5.1/ker +EXPORT_SYMBOL_GPL(free_nx_info); +EXPORT_SYMBOL_GPL(unhash_nx_info); + -diff -NurpP --minimal linux-3.7/kernel/vserver/proc.c linux-3.7-vs2.3.5.1/kernel/vserver/proc.c ---- linux-3.7/kernel/vserver/proc.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/proc.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,1110 @@ +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/proc.c linux-4.9/kernel/vserver/proc.c +--- linux-4.9/kernel/vserver/proc.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/proc.c 2021-02-24 15:47:45.124410596 +0100 +@@ -0,0 +1,1040 @@ +/* + * linux/kernel/vserver/proc.c + * + * Virtual Context Support + * -+ * Copyright (C) 2003-2011 Herbert Pötzl ++ * Copyright (C) 2003-2011 Herbert P?tzl + * + * V0.01 basic structure + * V0.02 adaptation vs1.3.0 @@ -20932,6 +20104,8 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/proc.c linux-3.7-vs2.3.5.1/kernel +#include "sched_proc.h" +#include "vci_config.h" + ++#include <../../fs/proc/internal.h> ++ + +static inline char *print_cap_t(char *buffer, kernel_cap_t *c) +{ @@ -20983,7 +20157,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/proc.c linux-3.7-vs2.3.5.1/kernel + atomic_read(&vs_global_fs), + atomic_read(&vs_global_mnt_ns), + atomic_read(&vs_global_uts_ns), -+ atomic_read(&nr_ipc_ns), ++ atomic_read(&vs_global_ipc_ns), + atomic_read(&vs_global_user_ns), + atomic_read(&vs_global_pid_ns), + atomic_read(&init_task.usage), @@ -21180,9 +20354,9 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/proc.c linux-3.7-vs2.3.5.1/kernel + + inode->i_mtime = inode->i_atime = inode->i_ctime = CURRENT_TIME; + -+ inode->i_uid = 0; -+ inode->i_gid = 0; -+ inode->i_tag = 0; ++ i_uid_write(inode, 0); ++ i_gid_write(inode, 0); ++ i_tag_write(inode, 0); +out: + return inode; +} @@ -21207,7 +20381,8 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/proc.c linux-3.7-vs2.3.5.1/kernel + +/* Lookups */ + -+typedef struct dentry *instantiate_t(struct inode *, struct dentry *, int, void *); ++typedef struct dentry *vx_instantiate_t(struct inode *, struct dentry *, int, void *); ++ + +/* + * Fill a directory entry. @@ -21217,14 +20392,14 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/proc.c linux-3.7-vs2.3.5.1/kernel + * + * Since all of the proc inode numbers are dynamically generated, the inode + * numbers do not exist until the inode is cache. This means creating the -+ * the dcache entry in readdir is necessary to keep the inode numbers -+ * reported by readdir in sync with the inode numbers reported ++ * the dcache entry in iterate is necessary to keep the inode numbers ++ * reported by iterate in sync with the inode numbers reported + * by stat. + */ -+static int proc_fill_cache(struct file *filp, void *dirent, filldir_t filldir, -+ char *name, int len, instantiate_t instantiate, int id, void *ptr) ++static int vx_proc_fill_cache(struct file *filp, struct dir_context *ctx, ++ char *name, int len, vx_instantiate_t instantiate, int id, void *ptr) +{ -+ struct dentry *child, *dir = filp->f_dentry; ++ struct dentry *child, *dir = filp->f_path.dentry; + struct inode *inode; + struct qstr qname; + ino_t ino = 0; @@ -21232,7 +20407,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/proc.c linux-3.7-vs2.3.5.1/kernel + + qname.name = name; + qname.len = len; -+ qname.hash = full_name_hash(name, len); ++ qname.hash = full_name_hash(NULL, name, len); + + child = d_lookup(dir, &qname); + if (!child) { @@ -21256,10 +20431,8 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/proc.c linux-3.7-vs2.3.5.1/kernel + dput(child); +end_instantiate: + if (!ino) -+ ino = find_inode_number(dir, &qname); -+ if (!ino) + ino = 1; -+ return filldir(dirent, name, len, filp->f_pos, ino, type); ++ return !dir_emit(ctx, name, len, ino, type); +} + + @@ -21275,7 +20448,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/proc.c linux-3.7-vs2.3.5.1/kernel +static int proc_xid_revalidate(struct dentry *dentry, unsigned int flags) +{ + struct inode *inode = dentry->d_inode; -+ xid_t xid = PROC_I(inode)->fd; ++ vxid_t xid = PROC_I(inode)->fd; + + if (flags & LOOKUP_RCU) /* FIXME: can be dropped? */ + return -ECHILD; @@ -21292,7 +20465,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/proc.c linux-3.7-vs2.3.5.1/kernel +static int proc_nid_revalidate(struct dentry *dentry, unsigned int flags) +{ + struct inode *inode = dentry->d_inode; -+ nid_t nid = PROC_I(inode)->fd; ++ vnid_t nid = PROC_I(inode)->fd; + + if (flags & LOOKUP_RCU) /* FIXME: can be dropped? */ + return -ECHILD; @@ -21310,7 +20483,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/proc.c linux-3.7-vs2.3.5.1/kernel +static ssize_t proc_vs_info_read(struct file *file, char __user *buf, + size_t count, loff_t *ppos) +{ -+ struct inode *inode = file->f_dentry->d_inode; ++ struct inode *inode = file->f_path.dentry->d_inode; + unsigned long page; + ssize_t length = 0; + @@ -21337,9 +20510,9 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/proc.c linux-3.7-vs2.3.5.1/kernel +static ssize_t proc_vx_info_read(struct file *file, char __user *buf, + size_t count, loff_t *ppos) +{ -+ struct inode *inode = file->f_dentry->d_inode; ++ struct inode *inode = file->f_path.dentry->d_inode; + struct vx_info *vxi = NULL; -+ xid_t xid = PROC_I(inode)->fd; ++ vxid_t xid = PROC_I(inode)->fd; + unsigned long page; + ssize_t length = 0; + @@ -21373,9 +20546,9 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/proc.c linux-3.7-vs2.3.5.1/kernel +static ssize_t proc_nx_info_read(struct file *file, char __user *buf, + size_t count, loff_t *ppos) +{ -+ struct inode *inode = file->f_dentry->d_inode; ++ struct inode *inode = file->f_path.dentry->d_inode; + struct nx_info *nxi = NULL; -+ nid_t nid = PROC_I(inode)->fd; ++ vnid_t nid = PROC_I(inode)->fd; + unsigned long page; + ssize_t length = 0; + @@ -21496,43 +20669,26 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/proc.c linux-3.7-vs2.3.5.1/kernel + return error; +} + -+static int proc_xid_readdir(struct file *filp, -+ void *dirent, filldir_t filldir) ++static int proc_xid_iterate(struct file *filp, struct dir_context *ctx) +{ -+ struct dentry *dentry = filp->f_dentry; ++ struct dentry *dentry = filp->f_path.dentry; + struct inode *inode = dentry->d_inode; + struct vs_entry *p = vx_base_stuff; + int size = sizeof(vx_base_stuff) / sizeof(struct vs_entry); -+ int pos, index; -+ u64 ino; ++ int index; + -+ pos = filp->f_pos; -+ switch (pos) { -+ case 0: -+ ino = inode->i_ino; -+ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0) -+ goto out; -+ pos++; -+ /* fall through */ -+ case 1: -+ ino = parent_ino(dentry); -+ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0) -+ goto out; -+ pos++; -+ /* fall through */ -+ default: -+ index = pos - 2; -+ if (index >= size) -+ goto out; ++ if (!dir_emit_dots(filp, ctx)) ++ return 0; ++ ++ index = ctx->pos - 2; ++ if (index < size) { + for (p += index; p->name; p++) { -+ if (proc_fill_cache(filp, dirent, filldir, p->name, p->len, ++ if (vx_proc_fill_cache(filp, ctx, p->name, p->len, + vs_proc_instantiate, PROC_I(inode)->fd, p)) -+ goto out; -+ pos++; ++ return 0; ++ ctx->pos++; + } + } -+out: -+ filp->f_pos = pos; + return 1; +} + @@ -21580,43 +20736,26 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/proc.c linux-3.7-vs2.3.5.1/kernel + return error; +} + -+static int proc_nid_readdir(struct file *filp, -+ void *dirent, filldir_t filldir) ++static int proc_nid_iterate(struct file *filp, struct dir_context *ctx) +{ -+ struct dentry *dentry = filp->f_dentry; ++ struct dentry *dentry = filp->f_path.dentry; + struct inode *inode = dentry->d_inode; + struct vs_entry *p = nx_base_stuff; + int size = sizeof(nx_base_stuff) / sizeof(struct vs_entry); -+ int pos, index; -+ u64 ino; ++ int index; + -+ pos = filp->f_pos; -+ switch (pos) { -+ case 0: -+ ino = inode->i_ino; -+ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0) -+ goto out; -+ pos++; -+ /* fall through */ -+ case 1: -+ ino = parent_ino(dentry); -+ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0) -+ goto out; -+ pos++; -+ /* fall through */ -+ default: -+ index = pos - 2; -+ if (index >= size) -+ goto out; ++ if (!dir_emit_dots(filp, ctx)) ++ return 0; ++ ++ index = ctx->pos - 2; ++ if (index < size) { + for (p += index; p->name; p++) { -+ if (proc_fill_cache(filp, dirent, filldir, p->name, p->len, ++ if (vx_proc_fill_cache(filp, ctx, p->name, p->len, + vs_proc_instantiate, PROC_I(inode)->fd, p)) -+ goto out; -+ pos++; ++ return 0; ++ ctx->pos++; + } + } -+out: -+ filp->f_pos = pos; + return 1; +} + @@ -21648,7 +20787,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/proc.c linux-3.7-vs2.3.5.1/kernel + +static struct file_operations proc_xid_file_operations = { + .read = generic_read_dir, -+ .readdir = proc_xid_readdir, ++ .iterate = proc_xid_iterate, +}; + +static struct inode_operations proc_xid_inode_operations = { @@ -21690,7 +20829,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/proc.c linux-3.7-vs2.3.5.1/kernel + +static struct file_operations proc_nid_file_operations = { + .read = generic_read_dir, -+ .readdir = proc_nid_readdir, ++ .iterate = proc_nid_iterate, +}; + +static struct inode_operations proc_nid_inode_operations = { @@ -21733,65 +20872,46 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/proc.c linux-3.7-vs2.3.5.1/kernel + +#define PROC_MAXVIDS 32 + -+int proc_virtual_readdir(struct file *filp, -+ void *dirent, filldir_t filldir) ++int proc_virtual_iterate(struct file *filp, struct dir_context *ctx) +{ -+ struct dentry *dentry = filp->f_dentry; -+ struct inode *inode = dentry->d_inode; + struct vs_entry *p = vx_virtual_stuff; + int size = sizeof(vx_virtual_stuff) / sizeof(struct vs_entry); -+ int pos, index; ++ int index; + unsigned int xid_array[PROC_MAXVIDS]; + char buf[PROC_NUMBUF]; + unsigned int nr_xids, i; -+ u64 ino; + -+ pos = filp->f_pos; -+ switch (pos) { -+ case 0: -+ ino = inode->i_ino; -+ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0) -+ goto out; -+ pos++; -+ /* fall through */ -+ case 1: -+ ino = parent_ino(dentry); -+ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0) -+ goto out; -+ pos++; -+ /* fall through */ -+ default: -+ index = pos - 2; -+ if (index >= size) -+ goto entries; ++ if (!dir_emit_dots(filp, ctx)) ++ return 0; ++ ++ index = ctx->pos - 2; ++ if (index < size) { + for (p += index; p->name; p++) { -+ if (proc_fill_cache(filp, dirent, filldir, p->name, p->len, ++ if (vx_proc_fill_cache(filp, ctx, p->name, p->len, + vs_proc_instantiate, 0, p)) -+ goto out; -+ pos++; -+ } -+ entries: -+ index = pos - size; -+ p = &vx_virtual_stuff[size - 1]; -+ nr_xids = get_xid_list(index, xid_array, PROC_MAXVIDS); -+ for (i = 0; i < nr_xids; i++) { -+ int n, xid = xid_array[i]; -+ unsigned int j = PROC_NUMBUF; -+ -+ n = xid; -+ do -+ buf[--j] = '0' + (n % 10); -+ while (n /= 10); -+ -+ if (proc_fill_cache(filp, dirent, filldir, -+ buf + j, PROC_NUMBUF - j, -+ vs_proc_instantiate, xid, p)) -+ goto out; -+ pos++; ++ return 0; ++ ctx->pos++; + } + } -+out: -+ filp->f_pos = pos; ++ ++ index = ctx->pos - size; ++ p = &vx_virtual_stuff[size - 1]; ++ nr_xids = get_xid_list(index, xid_array, PROC_MAXVIDS); ++ for (i = 0; i < nr_xids; i++) { ++ int n, xid = xid_array[i]; ++ unsigned int j = PROC_NUMBUF; ++ ++ n = xid; ++ do ++ buf[--j] = '0' + (n % 10); ++ while (n /= 10); ++ ++ if (vx_proc_fill_cache(filp, ctx, ++ buf + j, PROC_NUMBUF - j, ++ vs_proc_instantiate, xid, p)) ++ return 0; ++ ctx->pos++; ++ } + return 0; +} + @@ -21807,7 +20927,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/proc.c linux-3.7-vs2.3.5.1/kernel + +static struct file_operations proc_virtual_dir_operations = { + .read = generic_read_dir, -+ .readdir = proc_virtual_readdir, ++ .iterate = proc_virtual_iterate, +}; + +static struct inode_operations proc_virtual_dir_inode_operations = { @@ -21817,67 +20937,46 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/proc.c linux-3.7-vs2.3.5.1/kernel + + + -+ -+ -+int proc_virtnet_readdir(struct file *filp, -+ void *dirent, filldir_t filldir) ++int proc_virtnet_iterate(struct file *filp, struct dir_context *ctx) +{ -+ struct dentry *dentry = filp->f_dentry; -+ struct inode *inode = dentry->d_inode; + struct vs_entry *p = nx_virtnet_stuff; + int size = sizeof(nx_virtnet_stuff) / sizeof(struct vs_entry); -+ int pos, index; ++ int index; + unsigned int nid_array[PROC_MAXVIDS]; + char buf[PROC_NUMBUF]; + unsigned int nr_nids, i; -+ u64 ino; + -+ pos = filp->f_pos; -+ switch (pos) { -+ case 0: -+ ino = inode->i_ino; -+ if (filldir(dirent, ".", 1, pos, ino, DT_DIR) < 0) -+ goto out; -+ pos++; -+ /* fall through */ -+ case 1: -+ ino = parent_ino(dentry); -+ if (filldir(dirent, "..", 2, pos, ino, DT_DIR) < 0) -+ goto out; -+ pos++; -+ /* fall through */ -+ default: -+ index = pos - 2; -+ if (index >= size) -+ goto entries; ++ if (!dir_emit_dots(filp, ctx)) ++ return 0; ++ ++ index = ctx->pos - 2; ++ if (index < size) { + for (p += index; p->name; p++) { -+ if (proc_fill_cache(filp, dirent, filldir, p->name, p->len, ++ if (vx_proc_fill_cache(filp, ctx, p->name, p->len, + vs_proc_instantiate, 0, p)) -+ goto out; -+ pos++; -+ } -+ entries: -+ index = pos - size; -+ p = &nx_virtnet_stuff[size - 1]; -+ nr_nids = get_nid_list(index, nid_array, PROC_MAXVIDS); -+ for (i = 0; i < nr_nids; i++) { -+ int n, nid = nid_array[i]; -+ unsigned int j = PROC_NUMBUF; -+ -+ n = nid; -+ do -+ buf[--j] = '0' + (n % 10); -+ while (n /= 10); -+ -+ if (proc_fill_cache(filp, dirent, filldir, -+ buf + j, PROC_NUMBUF - j, -+ vs_proc_instantiate, nid, p)) -+ goto out; -+ pos++; ++ return 0; ++ ctx->pos++; + } + } -+out: -+ filp->f_pos = pos; ++ ++ index = ctx->pos - size; ++ p = &nx_virtnet_stuff[size - 1]; ++ nr_nids = get_nid_list(index, nid_array, PROC_MAXVIDS); ++ for (i = 0; i < nr_nids; i++) { ++ int n, nid = nid_array[i]; ++ unsigned int j = PROC_NUMBUF; ++ ++ n = nid; ++ do ++ buf[--j] = '0' + (n % 10); ++ while (n /= 10); ++ ++ if (vx_proc_fill_cache(filp, ctx, ++ buf + j, PROC_NUMBUF - j, ++ vs_proc_instantiate, nid, p)) ++ return 0; ++ ctx->pos++; ++ } + return 0; +} + @@ -21893,7 +20992,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/proc.c linux-3.7-vs2.3.5.1/kernel + +static struct file_operations proc_virtnet_dir_operations = { + .read = generic_read_dir, -+ .readdir = proc_virtnet_readdir, ++ .iterate = proc_virtnet_iterate, +}; + +static struct inode_operations proc_virtnet_dir_inode_operations = { @@ -21927,89 +21026,92 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/proc.c linux-3.7-vs2.3.5.1/kernel + +/* per pid info */ + ++void render_cap_t(struct seq_file *, const char *, ++ struct vx_info *, kernel_cap_t *); + -+int proc_pid_vx_info(struct task_struct *p, char *buffer) ++ ++int proc_pid_vx_info( ++ struct seq_file *m, ++ struct pid_namespace *ns, ++ struct pid *pid, ++ struct task_struct *p) +{ + struct vx_info *vxi; -+ char *orig = buffer; + -+ buffer += sprintf(buffer, "XID:\t%d\n", vx_task_xid(p)); ++ seq_printf(m, "XID:\t%d\n", vx_task_xid(p)); + + vxi = task_get_vx_info(p); + if (!vxi) -+ goto out; ++ return 0; + -+ buffer += sprintf(buffer, "BCaps:\t"); -+ buffer = print_cap_t(buffer, &vxi->vx_bcaps); -+ buffer += sprintf(buffer, "\n"); -+ buffer += sprintf(buffer, "CCaps:\t%016llx\n", ++ render_cap_t(m, "BCaps:\t", vxi, &vxi->vx_bcaps); ++ seq_printf(m, "CCaps:\t%016llx\n", + (unsigned long long)vxi->vx_ccaps); -+ buffer += sprintf(buffer, "CFlags:\t%016llx\n", ++ seq_printf(m, "CFlags:\t%016llx\n", + (unsigned long long)vxi->vx_flags); -+ buffer += sprintf(buffer, "CIPid:\t%d\n", vxi->vx_initpid); ++ seq_printf(m, "CIPid:\t%d\n", vxi->vx_initpid); + + put_vx_info(vxi); -+out: -+ return buffer - orig; ++ return 0; +} + + -+int proc_pid_nx_info(struct task_struct *p, char *buffer) ++int proc_pid_nx_info( ++ struct seq_file *m, ++ struct pid_namespace *ns, ++ struct pid *pid, ++ struct task_struct *p) +{ + struct nx_info *nxi; + struct nx_addr_v4 *v4a; +#ifdef CONFIG_IPV6 + struct nx_addr_v6 *v6a; +#endif -+ char *orig = buffer; + int i; + -+ buffer += sprintf(buffer, "NID:\t%d\n", nx_task_nid(p)); ++ seq_printf(m, "NID:\t%d\n", nx_task_nid(p)); + + nxi = task_get_nx_info(p); + if (!nxi) -+ goto out; ++ return 0; + -+ buffer += sprintf(buffer, "NCaps:\t%016llx\n", ++ seq_printf(m, "NCaps:\t%016llx\n", + (unsigned long long)nxi->nx_ncaps); -+ buffer += sprintf(buffer, "NFlags:\t%016llx\n", ++ seq_printf(m, "NFlags:\t%016llx\n", + (unsigned long long)nxi->nx_flags); + -+ buffer += sprintf(buffer, -+ "V4Root[bcast]:\t" NIPQUAD_FMT "\n", ++ seq_printf(m, "V4Root[bcast]:\t" NIPQUAD_FMT "\n", + NIPQUAD(nxi->v4_bcast.s_addr)); -+ buffer += sprintf (buffer, -+ "V4Root[lback]:\t" NIPQUAD_FMT "\n", ++ seq_printf(m, "V4Root[lback]:\t" NIPQUAD_FMT "\n", + NIPQUAD(nxi->v4_lback.s_addr)); + if (!NX_IPV4(nxi)) + goto skip_v4; + for (i = 0, v4a = &nxi->v4; v4a; i++, v4a = v4a->next) -+ buffer += sprintf(buffer, "V4Root[%d]:\t" NXAV4_FMT "\n", ++ seq_printf(m, "V4Root[%d]:\t" NXAV4_FMT "\n", + i, NXAV4(v4a)); +skip_v4: +#ifdef CONFIG_IPV6 + if (!NX_IPV6(nxi)) + goto skip_v6; + for (i = 0, v6a = &nxi->v6; v6a; i++, v6a = v6a->next) -+ buffer += sprintf(buffer, "V6Root[%d]:\t" NXAV6_FMT "\n", ++ seq_printf(m, "V6Root[%d]:\t" NXAV6_FMT "\n", + i, NXAV6(v6a)); +skip_v6: +#endif + put_nx_info(nxi); -+out: -+ return buffer - orig; ++ return 0; +} + -diff -NurpP --minimal linux-3.7/kernel/vserver/sched.c linux-3.7-vs2.3.5.1/kernel/vserver/sched.c ---- linux-3.7/kernel/vserver/sched.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/sched.c 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/sched.c linux-4.9/kernel/vserver/sched.c +--- linux-4.9/kernel/vserver/sched.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/sched.c 2021-02-24 15:47:45.124410596 +0100 @@ -0,0 +1,83 @@ +/* + * linux/kernel/vserver/sched.c + * + * Virtual Server: Scheduler Support + * -+ * Copyright (C) 2004-2010 Herbert Pötzl ++ * Copyright (C) 2004-2010 Herbert P?tzl + * + * V0.01 adapted Sam Vilains version to 2.6.3 + * V0.02 removed legacy interface @@ -22043,13 +21145,13 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/sched.c linux-3.7-vs2.3.5.1/kerne + data->prio_bias = MIN_PRIO_BIAS; + + if (data->cpu_id != ~0) { -+ vxi->sched.update = cpumask_of_cpu(data->cpu_id); ++ vxi->sched.update = *get_cpu_mask(data->cpu_id); + cpumask_and(&vxi->sched.update, &vxi->sched.update, + cpu_online_mask); + } else + cpumask_copy(&vxi->sched.update, cpu_online_mask); + -+ for_each_cpu_mask(cpu, vxi->sched.update) ++ for ((cpu) = 0; (cpu) < 1; (cpu)++, (void)vxi->sched.update) + vx_update_sched_param(&vxi->sched, + &vx_per_cpu(vxi, sched_pc, cpu)); + return 0; @@ -22087,9 +21189,9 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/sched.c linux-3.7-vs2.3.5.1/kerne + return 0; +} + -diff -NurpP --minimal linux-3.7/kernel/vserver/sched_init.h linux-3.7-vs2.3.5.1/kernel/vserver/sched_init.h ---- linux-3.7/kernel/vserver/sched_init.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/sched_init.h 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/sched_init.h linux-4.9/kernel/vserver/sched_init.h +--- linux-4.9/kernel/vserver/sched_init.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/sched_init.h 2021-02-24 15:47:45.124410596 +0100 @@ -0,0 +1,27 @@ + +static inline void vx_info_init_sched(struct _vx_sched *sched) @@ -22118,9 +21220,9 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/sched_init.h linux-3.7-vs2.3.5.1/ +{ + return; +} -diff -NurpP --minimal linux-3.7/kernel/vserver/sched_proc.h linux-3.7-vs2.3.5.1/kernel/vserver/sched_proc.h ---- linux-3.7/kernel/vserver/sched_proc.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/sched_proc.h 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/sched_proc.h linux-4.9/kernel/vserver/sched_proc.h +--- linux-4.9/kernel/vserver/sched_proc.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/sched_proc.h 2021-02-24 15:47:45.124410596 +0100 @@ -0,0 +1,32 @@ +#ifndef _VX_SCHED_PROC_H +#define _VX_SCHED_PROC_H @@ -22154,16 +21256,16 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/sched_proc.h linux-3.7-vs2.3.5.1/ +} + +#endif /* _VX_SCHED_PROC_H */ -diff -NurpP --minimal linux-3.7/kernel/vserver/signal.c linux-3.7-vs2.3.5.1/kernel/vserver/signal.c ---- linux-3.7/kernel/vserver/signal.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/signal.c 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/signal.c linux-4.9/kernel/vserver/signal.c +--- linux-4.9/kernel/vserver/signal.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/signal.c 2021-02-24 15:47:45.124410596 +0100 @@ -0,0 +1,134 @@ +/* + * linux/kernel/vserver/signal.c + * + * Virtual Server: Signal Support + * -+ * Copyright (C) 2003-2007 Herbert Pötzl ++ * Copyright (C) 2003-2007 Herbert P?tzl + * + * V0.01 broken out from vcontext V0.05 + * V0.02 changed vcmds to vxi arg @@ -22292,16 +21394,16 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/signal.c linux-3.7-vs2.3.5.1/kern + return ret; +} + -diff -NurpP --minimal linux-3.7/kernel/vserver/space.c linux-3.7-vs2.3.5.1/kernel/vserver/space.c ---- linux-3.7/kernel/vserver/space.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/space.c 2012-12-11 21:15:48.000000000 +0000 -@@ -0,0 +1,436 @@ +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/space.c linux-4.9/kernel/vserver/space.c +--- linux-4.9/kernel/vserver/space.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/space.c 2021-02-24 15:47:45.124410596 +0100 +@@ -0,0 +1,437 @@ +/* + * linux/kernel/vserver/space.c + * + * Virtual Server: Context Space Support + * -+ * Copyright (C) 2003-2010 Herbert Pötzl ++ * Copyright (C) 2003-2010 Herbert P?tzl + * + * V0.01 broken out from context.c 0.07 + * V0.02 added task locking for namespace @@ -22326,6 +21428,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/space.c linux-3.7-vs2.3.5.1/kerne +atomic_t vs_global_fs = ATOMIC_INIT(0); +atomic_t vs_global_mnt_ns = ATOMIC_INIT(0); +atomic_t vs_global_uts_ns = ATOMIC_INIT(0); ++atomic_t vs_global_ipc_ns = ATOMIC_INIT(0); +atomic_t vs_global_user_ns = ATOMIC_INIT(0); +atomic_t vs_global_pid_ns = ATOMIC_INIT(0); + @@ -22386,7 +21489,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/space.c linux-3.7-vs2.3.5.1/kerne + CLONE_NEWIPC | +#endif +#ifdef CONFIG_USER_NS -+ CLONE_NEWUSER | ++// CLONE_NEWUSER | +#endif +#ifdef CONFIG_PID_NS +// CLONE_NEWPID | @@ -22445,10 +21548,10 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/space.c linux-3.7-vs2.3.5.1/kerne + +#ifdef CONFIG_PID_NS + if (mask & CLONE_NEWPID) { -+ old_pid = nsproxy->pid_ns; -+ nsproxy->pid_ns = new_nsproxy->pid_ns; -+ if (nsproxy->pid_ns) -+ get_pid_ns(nsproxy->pid_ns); ++ old_pid = nsproxy->pid_ns_for_children; ++ nsproxy->pid_ns_for_children = new_nsproxy->pid_ns_for_children; ++ if (nsproxy->pid_ns_for_children) ++ get_pid_ns(nsproxy->pid_ns_for_children); + } else + old_pid = NULL; +#endif @@ -22732,16 +21835,16 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/space.c linux-3.7-vs2.3.5.1/kerne + return 0; +} + -diff -NurpP --minimal linux-3.7/kernel/vserver/switch.c linux-3.7-vs2.3.5.1/kernel/vserver/switch.c ---- linux-3.7/kernel/vserver/switch.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/switch.c 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/switch.c linux-4.9/kernel/vserver/switch.c +--- linux-4.9/kernel/vserver/switch.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/switch.c 2021-02-24 15:47:45.124410596 +0100 @@ -0,0 +1,556 @@ +/* + * linux/kernel/vserver/switch.c + * + * Virtual Server: Syscall Switch + * -+ * Copyright (C) 2003-2011 Herbert Pötzl ++ * Copyright (C) 2003-2011 Herbert P?tzl + * + * V0.01 syscall switch + * V0.02 added signal to context @@ -23292,16 +22395,16 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/switch.c linux-3.7-vs2.3.5.1/kern +} + +#endif /* CONFIG_COMPAT */ -diff -NurpP --minimal linux-3.7/kernel/vserver/sysctl.c linux-3.7-vs2.3.5.1/kernel/vserver/sysctl.c ---- linux-3.7/kernel/vserver/sysctl.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/sysctl.c 2012-12-11 15:56:33.000000000 +0000 -@@ -0,0 +1,247 @@ +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/sysctl.c linux-4.9/kernel/vserver/sysctl.c +--- linux-4.9/kernel/vserver/sysctl.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/sysctl.c 2021-02-24 15:47:45.127744035 +0100 +@@ -0,0 +1,249 @@ +/* + * kernel/vserver/sysctl.c + * + * Virtual Context Support + * -+ * Copyright (C) 2004-2007 Herbert Pötzl ++ * Copyright (C) 2004-2007 Herbert P?tzl + * + * V0.01 basic structure + * @@ -23311,7 +22414,10 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/sysctl.c linux-3.7-vs2.3.5.1/kern +#include +#include +#include ++#include ++ +#include ++#include + +enum { + CTL_DEBUG_ERROR = 0, @@ -23347,7 +22453,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/sysctl.c linux-3.7-vs2.3.5.1/kern + + +static struct ctl_table_header *vserver_table_header; -+static ctl_table vserver_root_table[]; ++static struct ctl_table vserver_root_table[]; + + +void vserver_register_sysctl(void) @@ -23366,8 +22472,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/sysctl.c linux-3.7-vs2.3.5.1/kern + } +} + -+ -+static int proc_dodebug(ctl_table *table, int write, ++static int proc_dodebug(struct ctl_table *table, int write, + void __user *buffer, size_t *lenp, loff_t *ppos) +{ + char tmpbuf[20], *p, c; @@ -23437,7 +22542,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/sysctl.c linux-3.7-vs2.3.5.1/kern + .extra2 = &zero, \ + } + -+static ctl_table vserver_debug_table[] = { ++static struct ctl_table vserver_debug_table[] = { + CTL_ENTRY(CTL_DEBUG_SWITCH, debug_switch), + CTL_ENTRY(CTL_DEBUG_XID, debug_xid), + CTL_ENTRY(CTL_DEBUG_NID, debug_nid), @@ -23454,7 +22559,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/sysctl.c linux-3.7-vs2.3.5.1/kern + { 0 } +}; + -+static ctl_table vserver_root_table[] = { ++static struct ctl_table vserver_root_table[] = { + { + .procname = "vserver", + .mode = 0555, @@ -23543,16 +22648,16 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/sysctl.c linux-3.7-vs2.3.5.1/kern +EXPORT_SYMBOL_GPL(vs_debug_perm); +EXPORT_SYMBOL_GPL(vs_debug_misc); + -diff -NurpP --minimal linux-3.7/kernel/vserver/tag.c linux-3.7-vs2.3.5.1/kernel/vserver/tag.c ---- linux-3.7/kernel/vserver/tag.c 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/tag.c 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/tag.c linux-4.9/kernel/vserver/tag.c +--- linux-4.9/kernel/vserver/tag.c 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/tag.c 2021-02-24 15:47:45.127744035 +0100 @@ -0,0 +1,63 @@ +/* + * linux/kernel/vserver/tag.c + * + * Virtual Server: Shallow Tag Space + * -+ * Copyright (C) 2007 Herbert Pötzl ++ * Copyright (C) 2007 Herbert P?tzl + * + * V0.01 basic implementation + * @@ -23566,7 +22671,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/tag.c linux-3.7-vs2.3.5.1/kernel/ +#include + + -+int dx_migrate_task(struct task_struct *p, tag_t tag) ++int dx_migrate_task(struct task_struct *p, vtag_t tag) +{ + if (!p) + BUG(); @@ -23590,7 +22695,7 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/tag.c linux-3.7-vs2.3.5.1/kernel/ + +int vc_task_tag(uint32_t id) +{ -+ tag_t tag; ++ vtag_t tag; + + if (id) { + struct task_struct *tsk; @@ -23610,9 +22715,9 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/tag.c linux-3.7-vs2.3.5.1/kernel/ +} + + -diff -NurpP --minimal linux-3.7/kernel/vserver/vci_config.h linux-3.7-vs2.3.5.1/kernel/vserver/vci_config.h ---- linux-3.7/kernel/vserver/vci_config.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/kernel/vserver/vci_config.h 2012-12-12 13:08:45.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/kernel/vserver/vci_config.h linux-4.9/kernel/vserver/vci_config.h +--- linux-4.9/kernel/vserver/vci_config.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/kernel/vserver/vci_config.h 2021-02-24 15:47:45.127744035 +0100 @@ -0,0 +1,80 @@ + +/* interface version */ @@ -23694,56 +22799,66 @@ diff -NurpP --minimal linux-3.7/kernel/vserver/vci_config.h linux-3.7-vs2.3.5.1/ + 0; +} + -diff -NurpP --minimal linux-3.7/mm/memcontrol.c linux-3.7-vs2.3.5.1/mm/memcontrol.c ---- linux-3.7/mm/memcontrol.c 2012-12-11 15:47:52.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/mm/memcontrol.c 2012-12-11 15:56:33.000000000 +0000 -@@ -884,6 +884,31 @@ struct mem_cgroup *mem_cgroup_from_task( - return mem_cgroup_from_css(task_subsys_state(p, mem_cgroup_subsys_id)); +diff -urNp -x '*.orig' linux-4.9/mm/memcontrol.c linux-4.9/mm/memcontrol.c +--- linux-4.9/mm/memcontrol.c 2021-02-24 15:47:32.527349847 +0100 ++++ linux-4.9/mm/memcontrol.c 2021-02-24 15:47:45.127744035 +0100 +@@ -2873,6 +2873,41 @@ static u64 mem_cgroup_read_u64(struct cg + } } -+u64 mem_cgroup_res_read_u64(struct mem_cgroup *mem, int member) ++unsigned long mem_cgroup_mem_usage_pages(struct mem_cgroup *memcg) +{ -+ return res_counter_read_u64(&mem->res, member); ++ return mem_cgroup_usage(memcg, false); +} + -+u64 mem_cgroup_memsw_read_u64(struct mem_cgroup *mem, int member) ++unsigned long mem_cgroup_mem_limit_pages(struct mem_cgroup *memcg) +{ -+ return res_counter_read_u64(&mem->memsw, member); ++ return memcg->memory.limit; +} + -+s64 mem_cgroup_stat_read_cache(struct mem_cgroup *mem) ++unsigned long mem_cgroup_memsw_usage_pages(struct mem_cgroup *memcg) +{ -+ return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_CACHE); ++ return mem_cgroup_usage(memcg, true); +} + -+s64 mem_cgroup_stat_read_anon(struct mem_cgroup *mem) ++unsigned long mem_cgroup_memsw_limit_pages(struct mem_cgroup *memcg) +{ -+ return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_RSS); ++ return memcg->memsw.limit; +} + -+s64 mem_cgroup_stat_read_mapped(struct mem_cgroup *mem) ++void dump_mem_cgroup(struct mem_cgroup *memcg) +{ -+ return mem_cgroup_read_stat(mem, MEM_CGROUP_STAT_FILE_MAPPED); ++ printk(KERN_INFO "memcg: %p/%d:\n" ++ "\tmemory:\t%lu/%lu %lu/%lu\n" ++ "\tmemsw:\t%lu/%lu %lu/%lu\n" ++ "\tkmem:\t%lu/%lu %lu/%lu\n", ++ memcg, memcg->id.id, ++ page_counter_read(&memcg->memory), memcg->memory.limit, ++ memcg->memory.watermark, memcg->memory.failcnt, ++ page_counter_read(&memcg->memsw), memcg->memsw.limit, ++ memcg->memsw.watermark, memcg->memsw.failcnt, ++ page_counter_read(&memcg->kmem), memcg->kmem.limit, ++ memcg->kmem.watermark, memcg->kmem.failcnt); +} + - struct mem_cgroup *try_get_mem_cgroup_from_mm(struct mm_struct *mm) + #ifndef CONFIG_SLOB + static int memcg_online_kmem(struct mem_cgroup *memcg) { - struct mem_cgroup *memcg = NULL; -diff -NurpP --minimal linux-3.7/mm/oom_kill.c linux-3.7-vs2.3.5.1/mm/oom_kill.c ---- linux-3.7/mm/oom_kill.c 2012-12-11 15:47:52.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/mm/oom_kill.c 2012-12-12 00:10:01.000000000 +0000 -@@ -35,6 +35,8 @@ - #include - #include - #include +diff -urNp -x '*.orig' linux-4.9/mm/oom_kill.c linux-4.9/mm/oom_kill.c +--- linux-4.9/mm/oom_kill.c 2021-02-24 15:47:32.534016722 +0100 ++++ linux-4.9/mm/oom_kill.c 2021-02-24 15:47:45.127744035 +0100 +@@ -38,6 +38,8 @@ + #include + #include + #include +#include +#include - #define CREATE_TRACE_POINTS - #include -@@ -155,11 +157,18 @@ struct task_struct *find_lock_task_mm(st + #include + #include "internal.h" +@@ -142,11 +144,18 @@ static inline bool is_memcg_oom(struct o static bool oom_unkillable_task(struct task_struct *p, - const struct mem_cgroup *memcg, const nodemask_t *nodemask) + struct mem_cgroup *memcg, const nodemask_t *nodemask) { - if (is_global_init(p)) + unsigned xid = vx_current_xid(); @@ -23761,41 +22876,41 @@ diff -NurpP --minimal linux-3.7/mm/oom_kill.c linux-3.7-vs2.3.5.1/mm/oom_kill.c /* When mem_cgroup_out_of_memory() and p is not member of the group */ if (memcg && !task_in_mem_cgroup(p, memcg)) return true; -@@ -472,8 +481,8 @@ void oom_kill_process(struct task_struct - dump_header(p, gfp_mask, order, memcg, nodemask); +@@ -851,8 +860,8 @@ static void oom_kill_process(struct oom_ + if (__ratelimit(&oom_rs)) + dump_header(oc, p); - task_lock(p); -- pr_err("%s: Kill process %d (%s) score %d or sacrifice child\n", +- pr_err("%s: Kill process %d (%s) score %u or sacrifice child\n", - message, task_pid_nr(p), p->comm, points); + pr_err("%s: Kill process %d:#%u (%s) score %d or sacrifice child\n", + message, task_pid_nr(p), p->xid, p->comm, points); - task_unlock(p); /* -@@ -518,8 +527,8 @@ void oom_kill_process(struct task_struct - - /* mm cannot safely be dereferenced after task_unlock(victim) */ - mm = victim->mm; -- pr_err("Killed process %d (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n", + * If any of p's children has a different mm and is eligible for kill, +@@ -910,8 +919,8 @@ static void oom_kill_process(struct oom_ + */ + do_send_sig_info(SIGKILL, SEND_SIG_FORCED, victim, true); + mark_oom_victim(victim); +- pr_err("Killed process %d (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB, shmem-rss:%lukB\n", - task_pid_nr(victim), victim->comm, K(victim->mm->total_vm), -+ pr_err("Killed process %d:#%u (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB\n", ++ pr_err("Killed process %d:%u (%s) total-vm:%lukB, anon-rss:%lukB, file-rss:%lukB, shmem-rss:%lukB\n", + task_pid_nr(victim), victim->xid, victim->comm, K(victim->mm->total_vm), K(get_mm_counter(victim->mm, MM_ANONPAGES)), - K(get_mm_counter(victim->mm, MM_FILEPAGES))); - task_unlock(victim); -@@ -589,6 +598,8 @@ int unregister_oom_notifier(struct notif + K(get_mm_counter(victim->mm, MM_FILEPAGES)), + K(get_mm_counter(victim->mm, MM_SHMEMPAGES))); +@@ -958,6 +967,8 @@ static void oom_kill_process(struct oom_ } - EXPORT_SYMBOL_GPL(unregister_oom_notifier); + #undef K +long vs_oom_action(unsigned int); + /* - * Try to acquire the OOM killer lock for the zones in zonelist. Returns zero - * if a parallel OOM killing is already taking place that includes a zone in -@@ -738,7 +749,12 @@ void out_of_memory(struct zonelist *zone + * Determines whether the kernel must panic because of the panic_on_oom sysctl. + */ +@@ -1063,7 +1074,12 @@ bool out_of_memory(struct oom_control *o /* Found nothing?!?! Either we hang forever, or we panic. */ - if (!p) { - dump_header(NULL, gfp_mask, order, NULL, mpol_mask); + if (!oc->chosen && !is_sysrq_oom(oc) && !is_memcg_oom(oc)) { + dump_header(oc, NULL); - panic("Out of memory and no killable processes...\n"); + + /* avoid panic for guest OOM */ @@ -23804,21 +22919,42 @@ diff -NurpP --minimal linux-3.7/mm/oom_kill.c linux-3.7-vs2.3.5.1/mm/oom_kill.c + else + panic("Out of memory and no killable processes...\n"); } - if (PTR_ERR(p) != -1UL) { - oom_kill_process(p, gfp_mask, order, points, totalpages, NULL, -diff -NurpP --minimal linux-3.7/mm/page_alloc.c linux-3.7-vs2.3.5.1/mm/page_alloc.c ---- linux-3.7/mm/page_alloc.c 2012-12-11 15:47:52.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/mm/page_alloc.c 2012-12-11 15:56:33.000000000 +0000 -@@ -58,6 +58,8 @@ - #include - #include - #include + if (oc->chosen && oc->chosen != (void *)-1UL) { + oom_kill_process(oc, !is_memcg_oom(oc) ? "Out of memory" : +diff -urNp -x '*.orig' linux-4.9/mm/page_alloc.c linux-4.9/mm/page_alloc.c +--- linux-4.9/mm/page_alloc.c 2021-02-24 15:47:32.534016722 +0100 ++++ linux-4.9/mm/page_alloc.c 2021-02-24 15:47:45.127744035 +0100 +@@ -65,6 +65,8 @@ + #include + #include + #include +#include +#include + #include #include - #include -@@ -2832,6 +2834,9 @@ void si_meminfo(struct sysinfo *val) +@@ -4171,14 +4173,17 @@ long si_mem_available(void) + */ + pagecache = pages[LRU_ACTIVE_FILE] + pages[LRU_INACTIVE_FILE]; + pagecache -= min(pagecache / 2, wmark_low); +- available += pagecache; ++ if (!vx_flags(VXF_VIRT_MEM, 0)) ++ available += pagecache; + + /* + * Part of the reclaimable slab consists of items that are in use, + * and cannot be freed. Cap this estimate at the low watermark. + */ +- available += global_page_state(NR_SLAB_RECLAIMABLE) - +- min(global_page_state(NR_SLAB_RECLAIMABLE) / 2, wmark_low); ++ if (!vx_flags(VXF_VIRT_MEM, 0)) ++ available += global_page_state(NR_SLAB_RECLAIMABLE) - ++ min(global_page_state(NR_SLAB_RECLAIMABLE) / 2, ++ wmark_low); + + if (available < 0) + available = 0; +@@ -4195,6 +4200,9 @@ void si_meminfo(struct sysinfo *val) val->totalhigh = totalhigh_pages; val->freehigh = nr_free_highpages(); val->mem_unit = PAGE_SIZE; @@ -23828,8 +22964,8 @@ diff -NurpP --minimal linux-3.7/mm/page_alloc.c linux-3.7-vs2.3.5.1/mm/page_allo } EXPORT_SYMBOL(si_meminfo); -@@ -2852,6 +2857,9 @@ void si_meminfo_node(struct sysinfo *val - val->freehigh = 0; +@@ -4229,6 +4237,9 @@ void si_meminfo_node(struct sysinfo *val + val->freehigh = free_highpages; #endif val->mem_unit = PAGE_SIZE; + @@ -23838,9 +22974,9 @@ diff -NurpP --minimal linux-3.7/mm/page_alloc.c linux-3.7-vs2.3.5.1/mm/page_allo } #endif -diff -NurpP --minimal linux-3.7/mm/pgtable-generic.c linux-3.7-vs2.3.5.1/mm/pgtable-generic.c ---- linux-3.7/mm/pgtable-generic.c 2012-12-11 15:47:52.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/mm/pgtable-generic.c 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/mm/pgtable-generic.c linux-4.9/mm/pgtable-generic.c +--- linux-4.9/mm/pgtable-generic.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/mm/pgtable-generic.c 2021-02-24 15:47:45.127744035 +0100 @@ -6,6 +6,8 @@ * Copyright (C) 2010 Linus Torvalds */ @@ -23850,31 +22986,31 @@ diff -NurpP --minimal linux-3.7/mm/pgtable-generic.c linux-3.7-vs2.3.5.1/mm/pgta #include #include #include -diff -NurpP --minimal linux-3.7/mm/shmem.c linux-3.7-vs2.3.5.1/mm/shmem.c ---- linux-3.7/mm/shmem.c 2012-12-11 15:47:52.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/mm/shmem.c 2012-12-11 15:56:33.000000000 +0000 -@@ -1820,7 +1820,7 @@ static int shmem_statfs(struct dentry *d +diff -urNp -x '*.orig' linux-4.9/mm/shmem.c linux-4.9/mm/shmem.c +--- linux-4.9/mm/shmem.c 2021-02-24 15:47:32.537350160 +0100 ++++ linux-4.9/mm/shmem.c 2021-02-24 15:47:45.127744035 +0100 +@@ -2806,7 +2806,7 @@ static int shmem_statfs(struct dentry *d { struct shmem_sb_info *sbinfo = SHMEM_SB(dentry->d_sb); - buf->f_type = TMPFS_MAGIC; + buf->f_type = TMPFS_SUPER_MAGIC; - buf->f_bsize = PAGE_CACHE_SIZE; + buf->f_bsize = PAGE_SIZE; buf->f_namelen = NAME_MAX; if (sbinfo->max_blocks) { -@@ -2504,7 +2504,7 @@ int shmem_fill_super(struct super_block +@@ -3631,7 +3631,7 @@ int shmem_fill_super(struct super_block sb->s_maxbytes = MAX_LFS_FILESIZE; - sb->s_blocksize = PAGE_CACHE_SIZE; - sb->s_blocksize_bits = PAGE_CACHE_SHIFT; + sb->s_blocksize = PAGE_SIZE; + sb->s_blocksize_bits = PAGE_SHIFT; - sb->s_magic = TMPFS_MAGIC; + sb->s_magic = TMPFS_SUPER_MAGIC; sb->s_op = &shmem_ops; sb->s_time_gran = 1; #ifdef CONFIG_TMPFS_XATTR -diff -NurpP --minimal linux-3.7/mm/slab.c linux-3.7-vs2.3.5.1/mm/slab.c ---- linux-3.7/mm/slab.c 2012-12-11 15:47:52.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/mm/slab.c 2012-12-11 15:56:33.000000000 +0000 -@@ -445,6 +445,8 @@ static void kmem_list3_init(struct kmem_ +diff -urNp -x '*.orig' linux-4.9/mm/slab.c linux-4.9/mm/slab.c +--- linux-4.9/mm/slab.c 2021-02-24 15:47:32.537350160 +0100 ++++ linux-4.9/mm/slab.c 2021-02-24 15:47:45.131077472 +0100 +@@ -307,6 +307,8 @@ static void kmem_cache_node_init(struct #define STATS_INC_FREEMISS(x) do { } while (0) #endif @@ -23883,23 +23019,15 @@ diff -NurpP --minimal linux-3.7/mm/slab.c linux-3.7-vs2.3.5.1/mm/slab.c #if DEBUG /* -@@ -3479,6 +3481,7 @@ retry: - - obj = slab_get_obj(cachep, slabp, nodeid); - check_slabp(cachep, slabp); -+ vx_slab_alloc(cachep, flags); - l3->free_objects--; - /* move slabp to correct slabp list: */ - list_del(&slabp->list); -@@ -3556,6 +3559,7 @@ slab_alloc_node(struct kmem_cache *cache +@@ -3344,6 +3346,7 @@ slab_alloc_node(struct kmem_cache *cache /* ___cache_alloc_node can fall back to other nodes */ ptr = ____cache_alloc_node(cachep, flags, nodeid); out: + vx_slab_alloc(cachep, flags); local_irq_restore(save_flags); ptr = cache_alloc_debugcheck_after(cachep, flags, ptr, caller); - kmemleak_alloc_recursive(ptr, cachep->object_size, 1, cachep->flags, -@@ -3746,6 +3750,7 @@ static inline void __cache_free(struct k + +@@ -3525,6 +3528,7 @@ void ___cache_free(struct kmem_cache *ca check_irq_off(); kmemleak_free_recursive(objp, cachep->flags); objp = cache_free_debugcheck(cachep, objp, caller); @@ -23907,9 +23035,9 @@ diff -NurpP --minimal linux-3.7/mm/slab.c linux-3.7-vs2.3.5.1/mm/slab.c kmemcheck_slab_free(cachep, objp, cachep->object_size); -diff -NurpP --minimal linux-3.7/mm/slab_vs.h linux-3.7-vs2.3.5.1/mm/slab_vs.h ---- linux-3.7/mm/slab_vs.h 1970-01-01 00:00:00.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/mm/slab_vs.h 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/mm/slab_vs.h linux-4.9/mm/slab_vs.h +--- linux-4.9/mm/slab_vs.h 1970-01-01 01:00:00.000000000 +0100 ++++ linux-4.9/mm/slab_vs.h 2021-02-24 15:47:45.131077472 +0100 @@ -0,0 +1,29 @@ + +#include @@ -23940,23 +23068,23 @@ diff -NurpP --minimal linux-3.7/mm/slab_vs.h linux-3.7-vs2.3.5.1/mm/slab_vs.h + atomic_sub(cachep->size, &vxi->cacct.slab[what]); +} + -diff -NurpP --minimal linux-3.7/mm/swapfile.c linux-3.7-vs2.3.5.1/mm/swapfile.c ---- linux-3.7/mm/swapfile.c 2012-12-11 15:47:52.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/mm/swapfile.c 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/mm/swapfile.c linux-4.9/mm/swapfile.c +--- linux-4.9/mm/swapfile.c 2021-02-24 15:47:32.540683597 +0100 ++++ linux-4.9/mm/swapfile.c 2021-02-24 15:47:45.131077472 +0100 @@ -39,6 +39,7 @@ #include #include - #include + #include +#include static bool swap_count_continued(struct swap_info_struct *, pgoff_t, unsigned char); -@@ -1685,6 +1686,16 @@ static int swap_show(struct seq_file *sw +@@ -2083,6 +2084,16 @@ static int swap_show(struct seq_file *sw if (si == SEQ_START_TOKEN) { seq_puts(swap,"Filename\t\t\t\tType\t\tSize\tUsed\tPriority\n"); + if (vx_flags(VXF_VIRT_MEM, 0)) { -+ struct sysinfo si; ++ struct sysinfo si = { 0 }; + + vx_vsi_swapinfo(&si); + if (si.totalswap < (1 << 10)) @@ -23968,8 +23096,8 @@ diff -NurpP --minimal linux-3.7/mm/swapfile.c linux-3.7-vs2.3.5.1/mm/swapfile.c return 0; } -@@ -2112,6 +2123,8 @@ void si_swapinfo(struct sysinfo *val) - val->freeswap = nr_swap_pages + nr_to_be_unused; +@@ -2630,6 +2641,8 @@ void si_swapinfo(struct sysinfo *val) + val->freeswap = atomic_long_read(&nr_swap_pages) + nr_to_be_unused; val->totalswap = total_swap_pages + nr_to_be_unused; spin_unlock(&swap_lock); + if (vx_flags(VXF_VIRT_MEM, 0)) @@ -23977,22 +23105,22 @@ diff -NurpP --minimal linux-3.7/mm/swapfile.c linux-3.7-vs2.3.5.1/mm/swapfile.c } /* -diff -NurpP --minimal linux-3.7/net/bridge/br_multicast.c linux-3.7-vs2.3.5.1/net/bridge/br_multicast.c ---- linux-3.7/net/bridge/br_multicast.c 2012-10-04 13:27:49.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/bridge/br_multicast.c 2012-12-11 15:56:33.000000000 +0000 -@@ -447,7 +447,7 @@ static struct sk_buff *br_ip6_multicast_ +diff -urNp -x '*.orig' linux-4.9/net/bridge/br_multicast.c linux-4.9/net/bridge/br_multicast.c +--- linux-4.9/net/bridge/br_multicast.c 2021-02-24 15:47:32.564017661 +0100 ++++ linux-4.9/net/bridge/br_multicast.c 2021-02-24 15:47:45.131077472 +0100 +@@ -465,7 +465,7 @@ static struct sk_buff *br_ip6_multicast_ ip6h->hop_limit = 1; ipv6_addr_set(&ip6h->daddr, htonl(0xff020000), 0, 0, htonl(1)); if (ipv6_dev_get_saddr(dev_net(br->dev), br->dev, &ip6h->daddr, 0, - &ip6h->saddr)) { + &ip6h->saddr, NULL)) { kfree_skb(skb); + br->has_ipv6_addr = 0; return NULL; - } -diff -NurpP --minimal linux-3.7/net/core/dev.c linux-3.7-vs2.3.5.1/net/core/dev.c ---- linux-3.7/net/core/dev.c 2012-12-11 15:47:53.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/core/dev.c 2012-12-11 15:56:33.000000000 +0000 -@@ -126,6 +126,7 @@ +diff -urNp -x '*.orig' linux-4.9/net/core/dev.c linux-4.9/net/core/dev.c +--- linux-4.9/net/core/dev.c 2021-02-24 15:47:33.077367054 +0100 ++++ linux-4.9/net/core/dev.c 2021-02-24 15:47:45.131077472 +0100 +@@ -127,6 +127,7 @@ #include #include #include @@ -24000,46 +23128,46 @@ diff -NurpP --minimal linux-3.7/net/core/dev.c linux-3.7-vs2.3.5.1/net/core/dev. #include #include #include -@@ -620,7 +621,8 @@ struct net_device *__dev_get_by_name(str +@@ -734,7 +735,8 @@ struct net_device *__dev_get_by_name(str struct hlist_head *head = dev_name_hash(net, name); - hlist_for_each_entry(dev, p, head, name_hlist) + hlist_for_each_entry(dev, head, name_hlist) - if (!strncmp(dev->name, name, IFNAMSIZ)) + if (!strncmp(dev->name, name, IFNAMSIZ) && + nx_dev_visible(current_nx_info(), dev)) return dev; return NULL; -@@ -646,7 +648,8 @@ struct net_device *dev_get_by_name_rcu(s +@@ -759,7 +761,8 @@ struct net_device *dev_get_by_name_rcu(s struct hlist_head *head = dev_name_hash(net, name); - hlist_for_each_entry_rcu(dev, p, head, name_hlist) + hlist_for_each_entry_rcu(dev, head, name_hlist) - if (!strncmp(dev->name, name, IFNAMSIZ)) + if (!strncmp(dev->name, name, IFNAMSIZ) && + nx_dev_visible(current_nx_info(), dev)) return dev; return NULL; -@@ -697,7 +700,8 @@ struct net_device *__dev_get_by_index(st +@@ -809,7 +812,8 @@ struct net_device *__dev_get_by_index(st struct hlist_head *head = dev_index_hash(net, ifindex); - hlist_for_each_entry(dev, p, head, index_hlist) + hlist_for_each_entry(dev, head, index_hlist) - if (dev->ifindex == ifindex) + if ((dev->ifindex == ifindex) && + nx_dev_visible(current_nx_info(), dev)) return dev; return NULL; -@@ -715,7 +719,7 @@ EXPORT_SYMBOL(__dev_get_by_index); +@@ -827,7 +831,7 @@ EXPORT_SYMBOL(__dev_get_by_index); * about locking. The caller must hold RCU lock. */ -struct net_device *dev_get_by_index_rcu(struct net *net, int ifindex) +struct net_device *dev_get_by_index_real_rcu(struct net *net, int ifindex) { - struct hlist_node *p; struct net_device *dev; -@@ -727,6 +731,16 @@ struct net_device *dev_get_by_index_rcu( + struct hlist_head *head = dev_index_hash(net, ifindex); +@@ -838,6 +842,16 @@ struct net_device *dev_get_by_index_rcu( return NULL; } @@ -24056,7 +23184,7 @@ diff -NurpP --minimal linux-3.7/net/core/dev.c linux-3.7-vs2.3.5.1/net/core/dev. EXPORT_SYMBOL(dev_get_by_index_rcu); -@@ -775,7 +789,8 @@ struct net_device *dev_getbyhwaddr_rcu(s +@@ -915,7 +929,8 @@ struct net_device *dev_getbyhwaddr_rcu(s for_each_netdev_rcu(net, dev) if (dev->type == type && @@ -24066,7 +23194,7 @@ diff -NurpP --minimal linux-3.7/net/core/dev.c linux-3.7-vs2.3.5.1/net/core/dev. return dev; return NULL; -@@ -787,9 +802,11 @@ struct net_device *__dev_getfirstbyhwtyp +@@ -927,9 +942,11 @@ struct net_device *__dev_getfirstbyhwtyp struct net_device *dev; ASSERT_RTNL(); @@ -24080,7 +23208,27 @@ diff -NurpP --minimal linux-3.7/net/core/dev.c linux-3.7-vs2.3.5.1/net/core/dev. return NULL; } -@@ -907,6 +924,8 @@ static int __dev_alloc_name(struct net * +@@ -941,7 +958,8 @@ struct net_device *dev_getfirstbyhwtype( + + rcu_read_lock(); + for_each_netdev_rcu(net, dev) +- if (dev->type == type) { ++ if ((dev->type == type) && ++ nx_dev_visible(current_nx_info(), dev)) { + dev_hold(dev); + ret = dev; + break; +@@ -971,7 +989,8 @@ struct net_device *__dev_get_by_flags(st + + ret = NULL; + for_each_netdev(net, dev) { +- if (((dev->flags ^ if_flags) & mask) == 0) { ++ if ((((dev->flags ^ if_flags) & mask) == 0) && ++ nx_dev_visible(current_nx_info(), dev)) { + ret = dev; + break; + } +@@ -1049,6 +1068,8 @@ static int __dev_alloc_name(struct net * continue; if (i < 0 || i >= max_netdevices) continue; @@ -24089,55 +23237,61 @@ diff -NurpP --minimal linux-3.7/net/core/dev.c linux-3.7-vs2.3.5.1/net/core/dev. /* avoid cases where sscanf is not exact inverse of printf */ snprintf(buf, IFNAMSIZ, name, i); -@@ -4129,6 +4148,8 @@ static int dev_ifconf(struct net *net, c +diff -urNp -x '*.orig' linux-4.9/net/core/net-procfs.c linux-4.9/net/core/net-procfs.c +--- linux-4.9/net/core/net-procfs.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/net/core/net-procfs.c 2021-02-24 15:47:45.131077472 +0100 +@@ -1,6 +1,7 @@ + #include + #include + #include ++#include + #include - total = 0; - for_each_netdev(net, dev) { -+ if (!nx_dev_visible(current_nx_info(), dev)) -+ continue; - for (i = 0; i < NPROTO; i++) { - if (gifconf_list[i]) { - int done; -@@ -4231,6 +4252,10 @@ static void dev_seq_printf_stats(struct + #define BUCKET_SPACE (32 - NETDEV_HASHBITS - 1) +@@ -77,8 +78,13 @@ static void dev_seq_stop(struct seq_file + static void dev_seq_printf_stats(struct seq_file *seq, struct net_device *dev) + { struct rtnl_link_stats64 temp; - const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp); +- const struct rtnl_link_stats64 *stats = dev_get_stats(dev, &temp); ++ const struct rtnl_link_stats64 *stats; + /* device visible inside network context? */ + if (!nx_dev_visible(current_nx_info(), dev)) + return; + ++ stats = dev_get_stats(dev, &temp); seq_printf(seq, "%6s: %7llu %7llu %4llu %4llu %4llu %5llu %10llu %9llu " "%8llu %7llu %4llu %4llu %4llu %5llu %7llu %10llu\n", dev->name, stats->rx_bytes, stats->rx_packets, -diff -NurpP --minimal linux-3.7/net/core/rtnetlink.c linux-3.7-vs2.3.5.1/net/core/rtnetlink.c ---- linux-3.7/net/core/rtnetlink.c 2012-12-11 15:47:53.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/core/rtnetlink.c 2012-12-11 15:56:33.000000000 +0000 -@@ -1080,6 +1080,8 @@ static int rtnl_dump_ifinfo(struct sk_bu - hlist_for_each_entry_rcu(dev, node, head, index_hlist) { +diff -urNp -x '*.orig' linux-4.9/net/core/rtnetlink.c linux-4.9/net/core/rtnetlink.c +--- linux-4.9/net/core/rtnetlink.c 2021-02-24 15:47:32.577351411 +0100 ++++ linux-4.9/net/core/rtnetlink.c 2021-02-24 15:47:45.134410910 +0100 +@@ -1615,6 +1615,8 @@ static int rtnl_dump_ifinfo(struct sk_bu + goto cont; if (idx < s_idx) goto cont; + if (!nx_dev_visible(skb->sk->sk_nx_info, dev)) + continue; - if (rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK, - NETLINK_CB(cb->skb).portid, - cb->nlh->nlmsg_seq, 0, -@@ -1971,6 +1973,9 @@ void rtmsg_ifinfo(int type, struct net_d - int err = -ENOBUFS; - size_t if_info_size; + err = rtnl_fill_ifinfo(skb, dev, RTM_NEWLINK, + NETLINK_CB(cb->skb).portid, + cb->nlh->nlmsg_seq, 0, +@@ -2841,6 +2843,9 @@ void rtmsg_ifinfo(int type, struct net_d + { + struct sk_buff *skb; + if (!nx_dev_visible(current_nx_info(), dev)) + return; + - skb = nlmsg_new((if_info_size = if_nlmsg_size(dev, 0)), GFP_KERNEL); - if (skb == NULL) - goto errout; -diff -NurpP --minimal linux-3.7/net/core/sock.c linux-3.7-vs2.3.5.1/net/core/sock.c ---- linux-3.7/net/core/sock.c 2012-12-11 15:47:53.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/core/sock.c 2012-12-11 15:56:33.000000000 +0000 -@@ -132,6 +132,10 @@ - #include + if (dev->reg_state != NETREG_REGISTERED) + return; + +diff -urNp -x '*.orig' linux-4.9/net/core/sock.c linux-4.9/net/core/sock.c +--- linux-4.9/net/core/sock.c 2021-02-24 15:47:32.580684849 +0100 ++++ linux-4.9/net/core/sock.c 2021-02-24 15:47:45.134410910 +0100 +@@ -135,6 +135,10 @@ #include + #include +#include +#include +#include @@ -24145,19 +23299,20 @@ diff -NurpP --minimal linux-3.7/net/core/sock.c linux-3.7-vs2.3.5.1/net/core/soc #include -@@ -1183,6 +1187,8 @@ static struct sock *sk_prot_alloc(struct +@@ -1339,6 +1343,9 @@ static struct sock *sk_prot_alloc(struct + if (!try_module_get(prot->owner)) goto out_free_sec; sk_tx_queue_clear(sk); - } ++ + sock_vx_init(sk); + sock_nx_init(sk); + } return sk; - -@@ -1295,6 +1301,11 @@ static void __sk_free(struct sock *sk) - put_cred(sk->sk_peer_cred); +@@ -1444,6 +1451,11 @@ static void __sk_destruct(struct rcu_hea put_pid(sk->sk_peer_pid); - put_net(sock_net(sk)); + if (likely(sk->sk_net_refcnt)) + put_net(sock_net(sk)); + vx_sock_dec(sk); + clr_vx_info(&sk->sk_vx_info); + sk->sk_xid = -1; @@ -24166,16 +23321,16 @@ diff -NurpP --minimal linux-3.7/net/core/sock.c linux-3.7-vs2.3.5.1/net/core/soc sk_prot_free(sk->sk_prot_creator, sk); } -@@ -1355,6 +1366,8 @@ struct sock *sk_clone_lock(const struct - +@@ -1505,6 +1517,8 @@ struct sock *sk_clone_lock(const struct /* SANITY */ - get_net(sock_net(newsk)); + if (likely(newsk->sk_net_refcnt)) + get_net(sock_net(newsk)); + sock_vx_init(newsk); + sock_nx_init(newsk); sk_node_init(&newsk->sk_node); sock_lock_init(newsk); bh_lock_sock(newsk); -@@ -1411,6 +1424,12 @@ struct sock *sk_clone_lock(const struct +@@ -1575,6 +1589,12 @@ struct sock *sk_clone_lock(const struct smp_wmb(); atomic_set(&newsk->sk_refcnt, 2); @@ -24188,9 +23343,9 @@ diff -NurpP --minimal linux-3.7/net/core/sock.c linux-3.7-vs2.3.5.1/net/core/soc /* * Increment the counter in the same struct proto as the master * sock (sk_refcnt_debug_inc uses newsk->sk_prot->socks, that -@@ -2206,6 +2225,12 @@ void sock_init_data(struct socket *sock, - - sk->sk_stamp = ktime_set(-1L, 0); +@@ -2500,6 +2520,12 @@ void sock_init_data(struct socket *sock, + seqlock_init(&sk->sk_stamp_seq); + #endif + set_vx_info(&sk->sk_vx_info, current_vx_info()); + sk->sk_xid = vx_current_xid(); @@ -24198,21 +23353,13 @@ diff -NurpP --minimal linux-3.7/net/core/sock.c linux-3.7-vs2.3.5.1/net/core/soc + set_nx_info(&sk->sk_nx_info, current_nx_info()); + sk->sk_nid = nx_current_nid(); + - /* - * Before updating sk_refcnt, we must commit prior changes to memory - * (Documentation/RCU/rculist_nulls.txt for details) -diff -NurpP --minimal linux-3.7/net/ipv4/af_inet.c linux-3.7-vs2.3.5.1/net/ipv4/af_inet.c ---- linux-3.7/net/ipv4/af_inet.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/af_inet.c 2012-12-11 15:56:33.000000000 +0000 -@@ -118,6 +118,7 @@ - #ifdef CONFIG_IP_MROUTE - #include - #endif -+#include - - - /* The inetsw table contains everything that inet_create needs to -@@ -346,9 +347,13 @@ lookup_protocol: + #ifdef CONFIG_NET_RX_BUSY_POLL + sk->sk_napi_id = 0; + sk->sk_ll_usec = sysctl_net_busy_read; +diff -urNp -x '*.orig' linux-4.9/net/ipv4/af_inet.c linux-4.9/net/ipv4/af_inet.c +--- linux-4.9/net/ipv4/af_inet.c 2021-02-24 15:47:32.587351724 +0100 ++++ linux-4.9/net/ipv4/af_inet.c 2021-02-24 15:47:45.134410910 +0100 +@@ -303,10 +303,15 @@ lookup_protocol: } err = -EPERM; @@ -24220,44 +23367,45 @@ diff -NurpP --minimal linux-3.7/net/ipv4/af_inet.c linux-3.7-vs2.3.5.1/net/ipv4/ + nx_capable(CAP_NET_RAW, NXC_RAW_ICMP)) + goto override; + - if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW)) + if (sock->type == SOCK_RAW && !kern && + !ns_capable(net->user_ns, CAP_NET_RAW)) goto out_rcu_unlock; -- + +override: - err = -EAFNOSUPPORT; - if (!inet_netns_ok(net, protocol)) - goto out_rcu_unlock; -@@ -473,6 +478,7 @@ int inet_bind(struct socket *sock, struc - struct sockaddr_in *addr = (struct sockaddr_in *)uaddr; + sock->ops = answer->ops; + answer_prot = answer->prot; + answer_flags = answer->flags; +@@ -424,6 +429,7 @@ int inet_bind(struct socket *sock, struc struct sock *sk = sock->sk; struct inet_sock *inet = inet_sk(sk); + struct net *net = sock_net(sk); + struct nx_v4_sock_addr nsa; unsigned short snum; int chk_addr_ret; - int err; -@@ -496,7 +502,11 @@ int inet_bind(struct socket *sock, struc - goto out; + u32 tb_id = RT_TABLE_LOCAL; +@@ -449,7 +455,11 @@ int inet_bind(struct socket *sock, struc } -- chk_addr_ret = inet_addr_type(sock_net(sk), addr->sin_addr.s_addr); + tb_id = l3mdev_fib_table_by_index(net, sk->sk_bound_dev_if) ? : tb_id; +- chk_addr_ret = inet_addr_type_table(net, addr->sin_addr.s_addr, tb_id); + err = v4_map_sock_addr(inet, addr, &nsa); + if (err) + goto out; + -+ chk_addr_ret = inet_addr_type(sock_net(sk), nsa.saddr); ++ chk_addr_ret = inet_addr_type_table(net, nsa.saddr, tb_id); /* Not specified by any standard per-se, however it breaks too * many applications when removed. It is unfortunate since -@@ -508,7 +518,7 @@ int inet_bind(struct socket *sock, struc +@@ -461,7 +471,7 @@ int inet_bind(struct socket *sock, struc err = -EADDRNOTAVAIL; - if (!sysctl_ip_nonlocal_bind && + if (!net->ipv4.sysctl_ip_nonlocal_bind && !(inet->freebind || inet->transparent) && - addr->sin_addr.s_addr != htonl(INADDR_ANY) && + nsa.saddr != htonl(INADDR_ANY) && chk_addr_ret != RTN_LOCAL && chk_addr_ret != RTN_MULTICAST && chk_addr_ret != RTN_BROADCAST) -@@ -533,7 +543,7 @@ int inet_bind(struct socket *sock, struc +@@ -487,7 +497,7 @@ int inet_bind(struct socket *sock, struc if (sk->sk_state != TCP_CLOSE || inet->inet_num) goto out_release_sock; @@ -24266,7 +23414,7 @@ diff -NurpP --minimal linux-3.7/net/ipv4/af_inet.c linux-3.7-vs2.3.5.1/net/ipv4/ if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST) inet->inet_saddr = 0; /* Use device */ -@@ -752,11 +762,13 @@ int inet_getname(struct socket *sock, st +@@ -706,11 +716,13 @@ int inet_getname(struct socket *sock, st peer == 1)) return -ENOTCONN; sin->sin_port = inet->inet_dport; @@ -24281,10 +23429,18 @@ diff -NurpP --minimal linux-3.7/net/ipv4/af_inet.c linux-3.7-vs2.3.5.1/net/ipv4/ sin->sin_port = inet->inet_sport; sin->sin_addr.s_addr = addr; } -diff -NurpP --minimal linux-3.7/net/ipv4/arp.c linux-3.7-vs2.3.5.1/net/ipv4/arp.c ---- linux-3.7/net/ipv4/arp.c 2012-10-04 13:27:49.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/arp.c 2012-12-11 15:56:33.000000000 +0000 -@@ -1318,6 +1318,7 @@ static void arp_format_neigh_entry(struc +@@ -894,6 +906,7 @@ static int inet_compat_ioctl(struct sock + return err; + } + #endif ++#include + + const struct proto_ops inet_stream_ops = { + .family = PF_INET, +diff -urNp -x '*.orig' linux-4.9/net/ipv4/arp.c linux-4.9/net/ipv4/arp.c +--- linux-4.9/net/ipv4/arp.c 2021-02-24 15:47:32.587351724 +0100 ++++ linux-4.9/net/ipv4/arp.c 2021-02-24 15:47:45.134410910 +0100 +@@ -1320,6 +1320,7 @@ static void arp_format_neigh_entry(struc struct net_device *dev = n->dev; int hatype = dev->type; @@ -24292,7 +23448,7 @@ diff -NurpP --minimal linux-3.7/net/ipv4/arp.c linux-3.7-vs2.3.5.1/net/ipv4/arp. read_lock(&n->lock); /* Convert hardware address to XX:XX:XX:XX ... form. */ #if IS_ENABLED(CONFIG_AX25) -@@ -1349,6 +1350,7 @@ static void arp_format_pneigh_entry(stru +@@ -1351,6 +1352,7 @@ static void arp_format_pneigh_entry(stru int hatype = dev ? dev->type : 0; char tbuf[16]; @@ -24300,10 +23456,10 @@ diff -NurpP --minimal linux-3.7/net/ipv4/arp.c linux-3.7-vs2.3.5.1/net/ipv4/arp. sprintf(tbuf, "%pI4", n->key); seq_printf(seq, "%-16s 0x%-10x0x%-10x%s * %s\n", tbuf, hatype, ATF_PUBL | ATF_PERM, "00:00:00:00:00:00", -diff -NurpP --minimal linux-3.7/net/ipv4/devinet.c linux-3.7-vs2.3.5.1/net/ipv4/devinet.c ---- linux-3.7/net/ipv4/devinet.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/devinet.c 2012-12-11 15:56:33.000000000 +0000 -@@ -513,6 +513,7 @@ struct in_device *inetdev_by_index(struc +diff -urNp -x '*.orig' linux-4.9/net/ipv4/devinet.c linux-4.9/net/ipv4/devinet.c +--- linux-4.9/net/ipv4/devinet.c 2021-02-24 15:47:32.587351724 +0100 ++++ linux-4.9/net/ipv4/devinet.c 2021-02-24 15:47:45.134410910 +0100 +@@ -547,6 +547,7 @@ struct in_device *inetdev_by_index(struc } EXPORT_SYMBOL(inetdev_by_index); @@ -24311,7 +23467,7 @@ diff -NurpP --minimal linux-3.7/net/ipv4/devinet.c linux-3.7-vs2.3.5.1/net/ipv4/ /* Called only from RTNL semaphored context. No locks. */ struct in_ifaddr *inet_ifa_byprefix(struct in_device *in_dev, __be32 prefix, -@@ -754,6 +755,8 @@ int devinet_ioctl(struct net *net, unsig +@@ -1006,6 +1007,8 @@ int devinet_ioctl(struct net *net, unsig in_dev = __in_dev_get_rtnl(dev); if (in_dev) { @@ -24320,7 +23476,7 @@ diff -NurpP --minimal linux-3.7/net/ipv4/devinet.c linux-3.7-vs2.3.5.1/net/ipv4/ if (tryaddrmatch) { /* Matthias Andree */ /* compare label and address (4.4BSD style) */ -@@ -762,6 +765,8 @@ int devinet_ioctl(struct net *net, unsig +@@ -1014,6 +1017,8 @@ int devinet_ioctl(struct net *net, unsig This is checked above. */ for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL; ifap = &ifa->ifa_next) { @@ -24329,7 +23485,7 @@ diff -NurpP --minimal linux-3.7/net/ipv4/devinet.c linux-3.7-vs2.3.5.1/net/ipv4/ if (!strcmp(ifr.ifr_name, ifa->ifa_label) && sin_orig.sin_addr.s_addr == ifa->ifa_local) { -@@ -774,9 +779,12 @@ int devinet_ioctl(struct net *net, unsig +@@ -1026,9 +1031,12 @@ int devinet_ioctl(struct net *net, unsig comparing just the label */ if (!ifa) { for (ifap = &in_dev->ifa_list; (ifa = *ifap) != NULL; @@ -24343,7 +23499,7 @@ diff -NurpP --minimal linux-3.7/net/ipv4/devinet.c linux-3.7-vs2.3.5.1/net/ipv4/ } } -@@ -929,6 +937,8 @@ static int inet_gifconf(struct net_devic +@@ -1182,6 +1190,8 @@ static int inet_gifconf(struct net_devic goto out; for (ifa = in_dev->ifa_list; ifa; ifa = ifa->ifa_next) { @@ -24352,15 +23508,15 @@ diff -NurpP --minimal linux-3.7/net/ipv4/devinet.c linux-3.7-vs2.3.5.1/net/ipv4/ if (!buf) { done += sizeof(ifr); continue; -@@ -1288,6 +1298,7 @@ static int inet_dump_ifaddr(struct sk_bu +@@ -1604,6 +1614,7 @@ static int inet_dump_ifaddr(struct sk_bu struct net_device *dev; struct in_device *in_dev; struct in_ifaddr *ifa; + struct sock *sk = skb->sk; struct hlist_head *head; - struct hlist_node *node; -@@ -1310,6 +1321,8 @@ static int inet_dump_ifaddr(struct sk_bu + s_h = cb->args[0]; +@@ -1627,6 +1638,8 @@ static int inet_dump_ifaddr(struct sk_bu for (ifa = in_dev->ifa_list, ip_idx = 0; ifa; ifa = ifa->ifa_next, ip_idx++) { @@ -24369,72 +23525,57 @@ diff -NurpP --minimal linux-3.7/net/ipv4/devinet.c linux-3.7-vs2.3.5.1/net/ipv4/ if (ip_idx < s_ip_idx) continue; if (inet_fill_ifaddr(skb, ifa, -diff -NurpP --minimal linux-3.7/net/ipv4/fib_trie.c linux-3.7-vs2.3.5.1/net/ipv4/fib_trie.c ---- linux-3.7/net/ipv4/fib_trie.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/fib_trie.c 2012-12-11 15:56:33.000000000 +0000 -@@ -2557,6 +2557,7 @@ static int fib_route_seq_show(struct seq - || fa->fa_type == RTN_MULTICAST) - continue; +diff -urNp -x '*.orig' linux-4.9/net/ipv4/fib_trie.c linux-4.9/net/ipv4/fib_trie.c +--- linux-4.9/net/ipv4/fib_trie.c 2021-02-24 15:47:32.590685161 +0100 ++++ linux-4.9/net/ipv4/fib_trie.c 2021-02-24 15:47:45.134410910 +0100 +@@ -2630,6 +2630,7 @@ static int fib_route_seq_show(struct seq + + seq_setwidth(seq, 127); + ++ /* FIXME: check for network context? */ + if (fi) + seq_printf(seq, + "%s\t%08X\t%08X\t%04X\t%d\t%u\t" +diff -urNp -x '*.orig' linux-4.9/net/ipv4/inet_connection_sock.c linux-4.9/net/ipv4/inet_connection_sock.c +--- linux-4.9/net/ipv4/inet_connection_sock.c 2021-02-24 15:47:32.590685161 +0100 ++++ linux-4.9/net/ipv4/inet_connection_sock.c 2021-02-24 15:47:45.134410910 +0100 +@@ -16,6 +16,7 @@ + #include + #include -+ /* FIXME: check for network context? */ - if (fi) - seq_printf(seq, - "%s\t%08X\t%08X\t%04X\t%d\t%u\t" -diff -NurpP --minimal linux-3.7/net/ipv4/inet_connection_sock.c linux-3.7-vs2.3.5.1/net/ipv4/inet_connection_sock.c ---- linux-3.7/net/ipv4/inet_connection_sock.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/inet_connection_sock.c 2012-12-11 15:56:33.000000000 +0000 -@@ -53,6 +53,37 @@ void inet_get_local_port_range(int *low, ++#include + #include + #include + #include +@@ -44,6 +45,7 @@ void inet_get_local_port_range(struct ne } EXPORT_SYMBOL(inet_get_local_port_range); -+int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2) -+{ -+ __be32 sk1_rcv_saddr = sk_rcv_saddr(sk1), -+ sk2_rcv_saddr = sk_rcv_saddr(sk2); -+ -+ if (inet_v6_ipv6only(sk2)) -+ return 0; -+ -+ if (sk1_rcv_saddr && -+ sk2_rcv_saddr && -+ sk1_rcv_saddr == sk2_rcv_saddr) -+ return 1; -+ -+ if (sk1_rcv_saddr && -+ !sk2_rcv_saddr && -+ v4_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr, NXA_MASK_BIND)) -+ return 1; -+ -+ if (sk2_rcv_saddr && -+ !sk1_rcv_saddr && -+ v4_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr, NXA_MASK_BIND)) -+ return 1; -+ -+ if (!sk1_rcv_saddr && -+ !sk2_rcv_saddr && -+ nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info)) -+ return 1; -+ -+ return 0; -+} + int inet_csk_bind_conflict(const struct sock *sk, const struct inet_bind_bucket *tb, bool relax) { -@@ -75,9 +106,7 @@ int inet_csk_bind_conflict(const struct - sk->sk_bound_dev_if == sk2->sk_bound_dev_if)) { - if (!reuse || !sk2->sk_reuse || - sk2->sk_state == TCP_LISTEN) { -- const __be32 sk2_rcv_saddr = sk_rcv_saddr(sk2); -- if (!sk2_rcv_saddr || !sk_rcv_saddr(sk) || -- sk2_rcv_saddr == sk_rcv_saddr(sk)) -+ if (ipv4_rcv_saddr_equal(sk, sk2)) +@@ -72,15 +74,13 @@ int inet_csk_bind_conflict(const struct + (sk2->sk_state != TCP_TIME_WAIT && + !uid_eq(uid, sock_i_uid(sk2))))) { + +- if (!sk2->sk_rcv_saddr || !sk->sk_rcv_saddr || +- sk2->sk_rcv_saddr == sk->sk_rcv_saddr) ++ if (ipv4_rcv_saddr_equal(sk, sk2, true)) break; } if (!relax && reuse && sk2->sk_reuse && -diff -NurpP --minimal linux-3.7/net/ipv4/inet_diag.c linux-3.7-vs2.3.5.1/net/ipv4/inet_diag.c ---- linux-3.7/net/ipv4/inet_diag.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/inet_diag.c 2012-12-11 17:05:58.000000000 +0000 + sk2->sk_state != TCP_LISTEN) { + +- if (!sk2->sk_rcv_saddr || !sk->sk_rcv_saddr || +- sk2->sk_rcv_saddr == sk->sk_rcv_saddr) ++ if (ipv4_rcv_saddr_equal(sk, sk2, true)) + break; + } + } +diff -urNp -x '*.orig' linux-4.9/net/ipv4/inet_diag.c linux-4.9/net/ipv4/inet_diag.c +--- linux-4.9/net/ipv4/inet_diag.c 2021-02-24 15:47:32.590685161 +0100 ++++ linux-4.9/net/ipv4/inet_diag.c 2021-02-24 15:47:45.134410910 +0100 @@ -31,6 +31,8 @@ #include @@ -24444,90 +23585,28 @@ diff -NurpP --minimal linux-3.7/net/ipv4/inet_diag.c linux-3.7-vs2.3.5.1/net/ipv #include #include -@@ -106,8 +108,10 @@ int inet_sk_diag_fill(struct sock *sk, s - - r->id.idiag_sport = inet->inet_sport; - r->id.idiag_dport = inet->inet_dport; -- r->id.idiag_src[0] = inet->inet_rcv_saddr; -- r->id.idiag_dst[0] = inet->inet_daddr; -+ r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info, -+ inet->inet_rcv_saddr); -+ r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info, -+ inet->inet_daddr); - - /* IPv6 dual-stack sockets use inet->tos for IPv4 connections, - * hence this needs to be included regardless of socket family. -@@ -239,8 +243,8 @@ static int inet_twsk_diag_fill(struct in - sock_diag_save_cookie(tw, r->id.idiag_cookie); - r->id.idiag_sport = tw->tw_sport; - r->id.idiag_dport = tw->tw_dport; -- r->id.idiag_src[0] = tw->tw_rcv_saddr; -- r->id.idiag_dst[0] = tw->tw_daddr; -+ r->id.idiag_src[0] = nx_map_sock_lback(tw->tw_nx_info, tw->tw_rcv_saddr); -+ r->id.idiag_dst[0] = nx_map_sock_lback(tw->tw_nx_info, tw->tw_daddr); - r->idiag_state = tw->tw_substate; - r->idiag_timer = 3; - r->idiag_expires = DIV_ROUND_UP(tmo * 1000, HZ); -@@ -284,12 +288,14 @@ int inet_diag_dump_one_icsk(struct inet_ - - err = -EINVAL; - if (req->sdiag_family == AF_INET) { -+ /* TODO: lback */ - sk = inet_lookup(net, hashinfo, req->id.idiag_dst[0], - req->id.idiag_dport, req->id.idiag_src[0], - req->id.idiag_sport, req->id.idiag_if); - } - #if IS_ENABLED(CONFIG_IPV6) - else if (req->sdiag_family == AF_INET6) { -+ /* TODO: lback */ - sk = inet6_lookup(net, hashinfo, - (struct in6_addr *)req->id.idiag_dst, - req->id.idiag_dport, -@@ -491,6 +497,7 @@ int inet_diag_bc_sk(const struct nlattr - } else - #endif - { -+ /* TODO: lback */ - entry.saddr = &inet->inet_rcv_saddr; - entry.daddr = &inet->inet_daddr; +@@ -87,8 +89,8 @@ void inet_diag_msg_common_fill(struct in + memset(&r->id.idiag_src, 0, sizeof(r->id.idiag_src)); + memset(&r->id.idiag_dst, 0, sizeof(r->id.idiag_dst)); + +- r->id.idiag_src[0] = sk->sk_rcv_saddr; +- r->id.idiag_dst[0] = sk->sk_daddr; ++ r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info, sk->sk_rcv_saddr); ++ r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info, sk->sk_daddr); } -@@ -649,6 +656,7 @@ static int inet_twsk_diag_dump(struct in - } else - #endif - { -+ /* TODO: lback */ - entry.saddr = &tw->tw_rcv_saddr; - entry.daddr = &tw->tw_daddr; - } -@@ -727,8 +735,8 @@ static int inet_diag_fill_req(struct sk_ - - r->id.idiag_sport = inet->inet_sport; - r->id.idiag_dport = ireq->rmt_port; -- r->id.idiag_src[0] = ireq->loc_addr; -- r->id.idiag_dst[0] = ireq->rmt_addr; -+ r->id.idiag_src[0] = nx_map_sock_lback(sk->sk_nx_info, ireq->loc_addr); -+ r->id.idiag_dst[0] = nx_map_sock_lback(sk->sk_nx_info, ireq->rmt_addr); - r->idiag_expires = jiffies_to_msecs(tmo); - r->idiag_rqueue = 0; - r->idiag_wqueue = 0; -@@ -791,6 +799,7 @@ static int inet_diag_dump_reqs(struct sk - r->id.idiag_dport) - continue; - -+ /* TODO: lback */ - if (bc) { - inet_diag_req_addrs(sk, req, &entry); - entry.dport = ntohs(ireq->rmt_port); -@@ -847,6 +856,8 @@ void inet_diag_dump_icsk(struct inet_has + } + EXPORT_SYMBOL_GPL(inet_diag_msg_common_fill); +@@ -882,6 +884,9 @@ void inet_diag_dump_icsk(struct inet_has if (!net_eq(sock_net(sk), net)) continue; + if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) + continue; ++ if (num < s_num) { num++; continue; -@@ -919,6 +930,8 @@ skip_listen_ht: +@@ -944,6 +949,8 @@ skip_listen_ht: if (!net_eq(sock_net(sk), net)) continue; @@ -24535,60 +23614,42 @@ diff -NurpP --minimal linux-3.7/net/ipv4/inet_diag.c linux-3.7-vs2.3.5.1/net/ipv + continue; if (num < s_num) goto next_normal; - if (!(r->idiag_states & (1 << sk->sk_state))) -@@ -947,7 +960,8 @@ next_normal: - &head->twchain) { - if (!net_eq(twsk_net(tw), net)) - continue; -- -+ if (!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT)) -+ continue; - if (num < s_num) - goto next_dying; - if (r->sdiag_family != AF_UNSPEC && -diff -NurpP --minimal linux-3.7/net/ipv4/inet_hashtables.c linux-3.7-vs2.3.5.1/net/ipv4/inet_hashtables.c ---- linux-3.7/net/ipv4/inet_hashtables.c 2012-07-22 21:39:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/inet_hashtables.c 2012-12-11 15:56:33.000000000 +0000 -@@ -22,6 +22,7 @@ + state = (sk->sk_state == TCP_TIME_WAIT) ? +diff -urNp -x '*.orig' linux-4.9/net/ipv4/inet_hashtables.c linux-4.9/net/ipv4/inet_hashtables.c +--- linux-4.9/net/ipv4/inet_hashtables.c 2021-02-24 15:47:32.594018600 +0100 ++++ linux-4.9/net/ipv4/inet_hashtables.c 2021-02-24 15:47:45.134410910 +0100 +@@ -24,6 +24,7 @@ #include #include #include +#include #include - - /* -@@ -156,6 +157,11 @@ static inline int compute_score(struct s + #include + #include +@@ -187,6 +188,11 @@ static inline int compute_score(struct s if (rcv_saddr != daddr) return -1; - score += 2; + score += 4; + } else { + /* block non nx_info ips */ + if (!v4_addr_in_nx_info(sk->sk_nx_info, + daddr, NXA_MASK_BIND)) + return -1; } - if (sk->sk_bound_dev_if) { + if (sk->sk_bound_dev_if || exact_dif) { if (sk->sk_bound_dev_if != dif) -@@ -173,7 +179,6 @@ static inline int compute_score(struct s - * wildcarded during the search since they can never be otherwise. - */ - -- - struct sock *__inet_lookup_listener(struct net *net, - struct inet_hashinfo *hashinfo, - const __be32 daddr, const unsigned short hnum, -@@ -196,6 +201,7 @@ begin: - hiscore = score; +@@ -302,6 +308,7 @@ begin: + goto found; } } + /* * if the nulls value we got at the end of this lookup is * not the expected one, we must restart lookup. -diff -NurpP --minimal linux-3.7/net/ipv4/netfilter.c linux-3.7-vs2.3.5.1/net/ipv4/netfilter.c ---- linux-3.7/net/ipv4/netfilter.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/netfilter.c 2012-12-11 15:56:33.000000000 +0000 -@@ -6,7 +6,7 @@ +diff -urNp -x '*.orig' linux-4.9/net/ipv4/netfilter.c linux-4.9/net/ipv4/netfilter.c +--- linux-4.9/net/ipv4/netfilter.c 2021-02-24 15:47:32.597352037 +0100 ++++ linux-4.9/net/ipv4/netfilter.c 2021-02-24 15:47:45.134410910 +0100 +@@ -11,7 +11,7 @@ #include #include #include @@ -24597,10 +23658,10 @@ diff -NurpP --minimal linux-3.7/net/ipv4/netfilter.c linux-3.7-vs2.3.5.1/net/ipv #include #include #include -diff -NurpP --minimal linux-3.7/net/ipv4/raw.c linux-3.7-vs2.3.5.1/net/ipv4/raw.c ---- linux-3.7/net/ipv4/raw.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/raw.c 2012-12-11 15:56:33.000000000 +0000 -@@ -118,7 +118,7 @@ static struct sock *__raw_v4_lookup(stru +diff -urNp -x '*.orig' linux-4.9/net/ipv4/raw.c linux-4.9/net/ipv4/raw.c +--- linux-4.9/net/ipv4/raw.c 2021-02-24 15:47:32.600685475 +0100 ++++ linux-4.9/net/ipv4/raw.c 2021-02-24 15:47:45.137744347 +0100 +@@ -128,7 +128,7 @@ static struct sock *__raw_v4_lookup(stru if (net_eq(sock_net(sk), net) && inet->inet_num == num && !(inet->inet_daddr && inet->inet_daddr != raddr) && @@ -24609,9 +23670,9 @@ diff -NurpP --minimal linux-3.7/net/ipv4/raw.c linux-3.7-vs2.3.5.1/net/ipv4/raw. !(sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif)) goto found; /* gotcha */ } -@@ -397,6 +397,12 @@ static int raw_send_hdrinc(struct sock * - icmp_out_count(net, ((struct icmphdr *) - skb_transport_header(skb))->type); +@@ -418,6 +418,12 @@ static int raw_send_hdrinc(struct sock * + skb_transport_header(skb))->type); + } + err = -EPERM; + if (!nx_check(0, VS_ADMIN) && !capable(CAP_NET_RAW) && @@ -24619,10 +23680,10 @@ diff -NurpP --minimal linux-3.7/net/ipv4/raw.c linux-3.7-vs2.3.5.1/net/ipv4/raw. + !v4_addr_in_nx_info(sk->sk_nx_info, iph->saddr, NXA_MASK_BIND)) + goto error_free; + - err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, skb, NULL, - rt->dst.dev, dst_output); - if (err > 0) -@@ -582,6 +588,16 @@ static int raw_sendmsg(struct kiocb *ioc + err = NF_HOOK(NFPROTO_IPV4, NF_INET_LOCAL_OUT, + net, sk, skb, NULL, rt->dst.dev, + dst_output); +@@ -625,6 +631,16 @@ static int raw_sendmsg(struct sock *sk, goto done; } @@ -24637,9 +23698,9 @@ diff -NurpP --minimal linux-3.7/net/ipv4/raw.c linux-3.7-vs2.3.5.1/net/ipv4/raw. + } + security_sk_classify_flow(sk, flowi4_to_flowi(&fl4)); - rt = ip_route_output_flow(sock_net(sk), &fl4, sk); + rt = ip_route_output_flow(net, &fl4, sk); if (IS_ERR(rt)) { -@@ -658,17 +674,19 @@ static int raw_bind(struct sock *sk, str +@@ -703,17 +719,19 @@ static int raw_bind(struct sock *sk, str { struct inet_sock *inet = inet_sk(sk); struct sockaddr_in *addr = (struct sockaddr_in *) uaddr; @@ -24662,7 +23723,7 @@ diff -NurpP --minimal linux-3.7/net/ipv4/raw.c linux-3.7-vs2.3.5.1/net/ipv4/raw. if (chk_addr_ret == RTN_MULTICAST || chk_addr_ret == RTN_BROADCAST) inet->inet_saddr = 0; /* Use device */ sk_dst_reset(sk); -@@ -720,7 +738,8 @@ static int raw_recvmsg(struct kiocb *ioc +@@ -762,7 +780,8 @@ static int raw_recvmsg(struct sock *sk, /* Copy the address. */ if (sin) { sin->sin_family = AF_INET; @@ -24671,18 +23732,18 @@ diff -NurpP --minimal linux-3.7/net/ipv4/raw.c linux-3.7-vs2.3.5.1/net/ipv4/raw. + nx_map_sock_lback(sk->sk_nx_info, ip_hdr(skb)->saddr); sin->sin_port = 0; memset(&sin->sin_zero, 0, sizeof(sin->sin_zero)); - } -@@ -916,7 +935,8 @@ static struct sock *raw_get_first(struct - struct hlist_node *node; - - sk_for_each(sk, node, &state->h->ht[state->bucket]) + *addr_len = sizeof(*sin); +@@ -958,7 +977,8 @@ static struct sock *raw_get_first(struct + for (state->bucket = 0; state->bucket < RAW_HTABLE_SIZE; + ++state->bucket) { + sk_for_each(sk, &state->h->ht[state->bucket]) - if (sock_net(sk) == seq_file_net(seq)) + if ((sock_net(sk) == seq_file_net(seq)) && -+ nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) ++ nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) goto found; } sk = NULL; -@@ -932,7 +952,8 @@ static struct sock *raw_get_next(struct +@@ -974,7 +994,8 @@ static struct sock *raw_get_next(struct sk = sk_next(sk); try_again: ; @@ -24692,57 +23753,46 @@ diff -NurpP --minimal linux-3.7/net/ipv4/raw.c linux-3.7-vs2.3.5.1/net/ipv4/raw. if (!sk && ++state->bucket < RAW_HTABLE_SIZE) { sk = sk_head(&state->h->ht[state->bucket]); -diff -NurpP --minimal linux-3.7/net/ipv4/route.c linux-3.7-vs2.3.5.1/net/ipv4/route.c ---- linux-3.7/net/ipv4/route.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/route.c 2012-12-11 15:56:33.000000000 +0000 -@@ -1952,7 +1952,7 @@ struct rtable *__ip_route_output_key(str +diff -urNp -x '*.orig' linux-4.9/net/ipv4/route.c linux-4.9/net/ipv4/route.c +--- linux-4.9/net/ipv4/route.c 2021-02-24 15:47:32.600685475 +0100 ++++ linux-4.9/net/ipv4/route.c 2021-02-24 15:47:45.137744347 +0100 +@@ -2287,7 +2287,7 @@ struct rtable *__ip_route_output_key_has if (fl4->flowi4_oif) { - dev_out = dev_get_by_index_rcu(net, fl4->flowi4_oif); + dev_out = dev_get_by_index_real_rcu(net, fl4->flowi4_oif); rth = ERR_PTR(-ENODEV); - if (dev_out == NULL) + if (!dev_out) goto out; -diff -NurpP --minimal linux-3.7/net/ipv4/tcp.c linux-3.7-vs2.3.5.1/net/ipv4/tcp.c ---- linux-3.7/net/ipv4/tcp.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/tcp.c 2012-12-11 15:56:33.000000000 +0000 -@@ -268,6 +268,7 @@ - #include +diff -urNp -x '*.orig' linux-4.9/net/ipv4/tcp.c linux-4.9/net/ipv4/tcp.c +--- linux-4.9/net/ipv4/tcp.c 2021-02-24 15:47:32.600685475 +0100 ++++ linux-4.9/net/ipv4/tcp.c 2021-02-24 15:47:45.137744347 +0100 +@@ -269,6 +269,7 @@ + #include #include #include +#include #include #include -diff -NurpP --minimal linux-3.7/net/ipv4/tcp_ipv4.c linux-3.7-vs2.3.5.1/net/ipv4/tcp_ipv4.c ---- linux-3.7/net/ipv4/tcp_ipv4.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/tcp_ipv4.c 2012-12-11 17:07:07.000000000 +0000 -@@ -2264,6 +2264,12 @@ static void *listening_get_next(struct s - req = req->dl_next; - while (1) { - while (req) { -+ vxdprintk(VXD_CBIT(net, 6), -+ "sk,req: %p [#%d] (from %d)", req->sk, -+ (req->sk)?req->sk->sk_nid:0, nx_current_nid()); -+ if (req->sk && -+ !nx_check(req->sk->sk_nid, VS_WATCH_P | VS_IDENT)) -+ continue; - if (req->rsk_ops->family == st->family) { - cur = req; - goto out; -@@ -2288,6 +2294,10 @@ get_req: - } +diff -urNp -x '*.orig' linux-4.9/net/ipv4/tcp_ipv4.c linux-4.9/net/ipv4/tcp_ipv4.c +--- linux-4.9/net/ipv4/tcp_ipv4.c 2021-02-24 15:47:32.604018912 +0100 ++++ linux-4.9/net/ipv4/tcp_ipv4.c 2021-02-24 15:47:45.137744347 +0100 +@@ -1944,8 +1944,12 @@ get_head: + sk = sk_nulls_next(sk); get_sk: sk_nulls_for_each_from(sk, node) { + vxdprintk(VXD_CBIT(net, 6), "sk: %p [#%d] (from %d)", + sk, sk->sk_nid, nx_current_nid()); -+ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) -+ continue; if (!net_eq(sock_net(sk), net)) continue; - if (sk->sk_family == st->family) { -@@ -2364,6 +2374,11 @@ static void *established_get_first(struc ++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) ++ continue; + if (sk->sk_family == st->family) + return sk; + } +@@ -1999,6 +2003,11 @@ static void *established_get_first(struc spin_lock_bh(lock); sk_nulls_for_each(sk, node, &tcp_hashinfo.ehash[st->bucket].chain) { @@ -24754,31 +23804,8 @@ diff -NurpP --minimal linux-3.7/net/ipv4/tcp_ipv4.c linux-3.7-vs2.3.5.1/net/ipv4 if (sk->sk_family != st->family || !net_eq(sock_net(sk), net)) { continue; -@@ -2374,6 +2389,11 @@ static void *established_get_first(struc - st->state = TCP_SEQ_STATE_TIME_WAIT; - inet_twsk_for_each(tw, node, - &tcp_hashinfo.ehash[st->bucket].twchain) { -+ vxdprintk(VXD_CBIT(net, 6), -+ "tw: %p [#%d] (from %d)", -+ tw, tw->tw_nid, nx_current_nid()); -+ if (!nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT)) -+ continue; - if (tw->tw_family != st->family || - !net_eq(twsk_net(tw), net)) { - continue; -@@ -2403,7 +2423,9 @@ static void *established_get_next(struct - tw = cur; - tw = tw_next(tw); - get_tw: -- while (tw && (tw->tw_family != st->family || !net_eq(twsk_net(tw), net))) { -+ while (tw && (tw->tw_family != st->family || -+ !net_eq(twsk_net(tw), net) || -+ !nx_check(tw->tw_nid, VS_WATCH_P | VS_IDENT))) { - tw = tw_next(tw); - } - if (tw) { -@@ -2427,6 +2449,11 @@ get_tw: - sk = sk_nulls_next(sk); +@@ -2025,6 +2034,11 @@ static void *established_get_next(struct + sk = sk_nulls_next(sk); sk_nulls_for_each_from(sk, node) { + vxdprintk(VXD_CBIT(net, 6), @@ -24787,24 +23814,24 @@ diff -NurpP --minimal linux-3.7/net/ipv4/tcp_ipv4.c linux-3.7-vs2.3.5.1/net/ipv4 + if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) + continue; if (sk->sk_family == st->family && net_eq(sock_net(sk), net)) - goto found; + return sk; } -@@ -2632,9 +2659,9 @@ static void get_openreq4(const struct so +@@ -2216,9 +2230,9 @@ static void get_openreq4(const struct re seq_printf(f, "%4d: %08X:%04X %08X:%04X" - " %02X %08X:%08X %02X:%08lX %08X %5d %8d %u %d %pK%n", + " %02X %08X:%08X %02X:%08lX %08X %5u %8d %u %d %pK", i, -- ireq->loc_addr, -+ nx_map_sock_lback(current_nx_info(), ireq->loc_addr), - ntohs(inet_sk(sk)->inet_sport), -- ireq->rmt_addr, -+ nx_map_sock_lback(current_nx_info(), ireq->rmt_addr), - ntohs(ireq->rmt_port), +- ireq->ir_loc_addr, ++ nx_map_sock_lback(current_nx_info(), ireq->ir_loc_addr), + ireq->ir_num, +- ireq->ir_rmt_addr, ++ nx_map_sock_lback(current_nx_info(), ireq->ir_rmt_addr), + ntohs(ireq->ir_rmt_port), TCP_SYN_RECV, 0, 0, /* could print option size, but that is af dependent. */ -@@ -2657,8 +2684,8 @@ static void get_tcp4_sock(struct sock *s +@@ -2241,8 +2255,8 @@ static void get_tcp4_sock(struct sock *s const struct inet_connection_sock *icsk = inet_csk(sk); const struct inet_sock *inet = inet_sk(sk); - struct fastopen_queue *fastopenq = icsk->icsk_accept_queue.fastopenq; + const struct fastopen_queue *fastopenq = &icsk->icsk_accept_queue.fastopenq; - __be32 dest = inet->inet_daddr; - __be32 src = inet->inet_rcv_saddr; + __be32 dest = nx_map_sock_lback(current_nx_info(), inet->inet_daddr); @@ -24812,9 +23839,9 @@ diff -NurpP --minimal linux-3.7/net/ipv4/tcp_ipv4.c linux-3.7-vs2.3.5.1/net/ipv4 __u16 destp = ntohs(inet->inet_dport); __u16 srcp = ntohs(inet->inet_sport); int rx_queue; -@@ -2714,8 +2741,8 @@ static void get_timewait4_sock(const str +@@ -2301,8 +2315,8 @@ static void get_timewait4_sock(const str + __be32 dest, src; __u16 destp, srcp; - long delta = tw->tw_ttd - jiffies; - dest = tw->tw_daddr; - src = tw->tw_rcv_saddr; @@ -24823,9 +23850,9 @@ diff -NurpP --minimal linux-3.7/net/ipv4/tcp_ipv4.c linux-3.7-vs2.3.5.1/net/ipv4 destp = ntohs(tw->tw_dport); srcp = ntohs(tw->tw_sport); -diff -NurpP --minimal linux-3.7/net/ipv4/tcp_minisocks.c linux-3.7-vs2.3.5.1/net/ipv4/tcp_minisocks.c ---- linux-3.7/net/ipv4/tcp_minisocks.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/tcp_minisocks.c 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/net/ipv4/tcp_minisocks.c linux-4.9/net/ipv4/tcp_minisocks.c +--- linux-4.9/net/ipv4/tcp_minisocks.c 2021-02-24 15:47:32.604018912 +0100 ++++ linux-4.9/net/ipv4/tcp_minisocks.c 2021-02-24 15:47:45.137744347 +0100 @@ -23,6 +23,9 @@ #include #include @@ -24836,9 +23863,9 @@ diff -NurpP --minimal linux-3.7/net/ipv4/tcp_minisocks.c linux-3.7-vs2.3.5.1/net #include #include #include -@@ -289,6 +292,11 @@ void tcp_time_wait(struct sock *sk, int - tcptw->tw_ts_recent = tp->rx_opt.ts_recent; - tcptw->tw_ts_recent_stamp = tp->rx_opt.ts_recent_stamp; +@@ -286,6 +289,11 @@ void tcp_time_wait(struct sock *sk, int + tcptw->tw_ts_offset = tp->tsoffset; + tcptw->tw_last_oow_ack_time = 0; + tw->tw_xid = sk->sk_xid; + tw->tw_vx_info = NULL; @@ -24848,38 +23875,54 @@ diff -NurpP --minimal linux-3.7/net/ipv4/tcp_minisocks.c linux-3.7-vs2.3.5.1/net #if IS_ENABLED(CONFIG_IPV6) if (tw->tw_family == PF_INET6) { struct ipv6_pinfo *np = inet6_sk(sk); -diff -NurpP --minimal linux-3.7/net/ipv4/udp.c linux-3.7-vs2.3.5.1/net/ipv4/udp.c ---- linux-3.7/net/ipv4/udp.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv4/udp.c 2012-12-11 15:56:33.000000000 +0000 -@@ -300,14 +300,7 @@ fail: - } - EXPORT_SYMBOL(udp_lib_get_port); - --static int ipv4_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2) --{ -- struct inet_sock *inet1 = inet_sk(sk1), *inet2 = inet_sk(sk2); -- -- return (!ipv6_only_sock(sk2) && -- (!inet1->inet_rcv_saddr || !inet2->inet_rcv_saddr || -- inet1->inet_rcv_saddr == inet2->inet_rcv_saddr)); --} -+extern int ipv4_rcv_saddr_equal(const struct sock *, const struct sock *); +diff -urNp -x '*.orig' linux-4.9/net/ipv4/udp.c linux-4.9/net/ipv4/udp.c +--- linux-4.9/net/ipv4/udp.c 2021-02-24 15:47:32.607352350 +0100 ++++ linux-4.9/net/ipv4/udp.c 2021-02-24 15:47:45.137744347 +0100 +@@ -361,12 +361,26 @@ int ipv4_rcv_saddr_equal(const struct so + bool match_wildcard) + { + struct inet_sock *inet1 = inet_sk(sk1), *inet2 = inet_sk(sk2); ++ __be32 sk1_rcv_saddr = inet1->inet_rcv_saddr, ++ sk2_rcv_saddr = inet2->inet_rcv_saddr; - static unsigned int udp4_portaddr_hash(struct net *net, __be32 saddr, - unsigned int port) -@@ -342,6 +335,11 @@ static inline int compute_score(struct s - if (inet->inet_rcv_saddr != daddr) - return -1; - score += 2; +- if (!ipv6_only_sock(sk2)) { +- if (inet1->inet_rcv_saddr == inet2->inet_rcv_saddr) +- return 1; +- if (!inet1->inet_rcv_saddr || !inet2->inet_rcv_saddr) +- return match_wildcard; ++ if (ipv6_only_sock(sk2)) ++ return 0; ++ ++ if (sk1_rcv_saddr && sk2_rcv_saddr && sk1_rcv_saddr == sk2_rcv_saddr) ++ return 1; ++ ++ if (match_wildcard) { ++ if (!sk2_rcv_saddr && !sk1_rcv_saddr) ++ return nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info); ++ ++ if (!sk2_rcv_saddr && sk1_rcv_saddr) ++ return v4_addr_in_nx_info(sk2->sk_nx_info, ++ sk1_rcv_saddr, NXA_MASK_BIND); ++ ++ if (!sk1_rcv_saddr && sk2_rcv_saddr) ++ return v4_addr_in_nx_info(sk1->sk_nx_info, ++ sk2_rcv_saddr, NXA_MASK_BIND); + } + return 0; + } +@@ -408,6 +422,11 @@ static int compute_score(struct sock *sk + if (inet->inet_rcv_saddr != daddr) + return -1; + score += 4; + } else { + /* block non nx_info ips */ + if (!v4_addr_in_nx_info(sk->sk_nx_info, + daddr, NXA_MASK_BIND)) + return -1; - } - if (inet->inet_daddr) { - if (inet->inet_daddr != saddr) -@@ -445,6 +443,7 @@ exact_match: + } + + if (inet->inet_daddr) { +@@ -483,6 +502,7 @@ static struct sock *udp4_lib_lookup2(str return result; } @@ -24887,46 +23930,17 @@ diff -NurpP --minimal linux-3.7/net/ipv4/udp.c linux-3.7-vs2.3.5.1/net/ipv4/udp. /* UDP is nearly always wildcards out the wazoo, it makes no sense to try * harder than this. -DaveM */ -@@ -490,6 +489,11 @@ begin: - sk_nulls_for_each_rcu(sk, node, &hslot->head) { - score = compute_score(sk, net, saddr, hnum, sport, - daddr, dport, dif); -+ /* FIXME: disabled? -+ if (score == 9) { -+ result = sk; -+ break; -+ } else */ - if (score > badness) { - result = sk; - badness = score; -@@ -503,6 +507,7 @@ begin: - if (get_nulls_value(node) != slot) - goto begin; - -+ - if (result) { - if (unlikely(!atomic_inc_not_zero_hint(&result->sk_refcnt, 2))) - result = NULL; -@@ -512,6 +517,7 @@ begin: - goto begin; - } - } -+ - rcu_read_unlock(); - return result; - } -@@ -555,8 +561,7 @@ static inline struct sock *udp_v4_mcast_ - udp_sk(s)->udp_port_hash != hnum || - (inet->inet_daddr && inet->inet_daddr != rmt_addr) || - (inet->inet_dport != rmt_port && inet->inet_dport) || -- (inet->inet_rcv_saddr && -- inet->inet_rcv_saddr != loc_addr) || -+ !v4_sock_addr_match(sk->sk_nx_info, inet, loc_addr) || - ipv6_only_sock(s) || - (s->sk_bound_dev_if && s->sk_bound_dev_if != dif)) - continue; -@@ -939,6 +944,16 @@ int udp_sendmsg(struct kiocb *iocb, stru - inet_sk_flowi_flags(sk)|FLOWI_FLAG_CAN_SLEEP, +@@ -607,7 +627,7 @@ static inline bool __udp_is_mcast_sock(s + udp_sk(sk)->udp_port_hash != hnum || + (inet->inet_daddr && inet->inet_daddr != rmt_addr) || + (inet->inet_dport != rmt_port && inet->inet_dport) || +- (inet->inet_rcv_saddr && inet->inet_rcv_saddr != loc_addr) || ++ !v4_sock_addr_match(sk->sk_nx_info, inet, loc_addr) || + ipv6_only_sock(sk) || + (sk->sk_bound_dev_if && sk->sk_bound_dev_if != dif)) + return false; +@@ -1024,6 +1044,16 @@ int udp_sendmsg(struct sock *sk, struct + flow_flags, faddr, saddr, dport, inet->inet_sport); + if (sk->sk_nx_info) { @@ -24942,7 +23956,7 @@ diff -NurpP --minimal linux-3.7/net/ipv4/udp.c linux-3.7-vs2.3.5.1/net/ipv4/udp. security_sk_classify_flow(sk, flowi4_to_flowi(fl4)); rt = ip_route_output_flow(net, fl4, sk); if (IS_ERR(rt)) { -@@ -1244,7 +1259,8 @@ try_again: +@@ -1321,7 +1351,8 @@ try_again: if (sin) { sin->sin_family = AF_INET; sin->sin_port = udp_hdr(skb)->source; @@ -24950,10 +23964,10 @@ diff -NurpP --minimal linux-3.7/net/ipv4/udp.c linux-3.7-vs2.3.5.1/net/ipv4/udp. + sin->sin_addr.s_addr = nx_map_sock_lback( + skb->sk->sk_nx_info, ip_hdr(skb)->saddr); memset(sin->sin_zero, 0, sizeof(sin->sin_zero)); + *addr_len = sizeof(*sin); } - if (inet->cmsg_flags) -@@ -1992,6 +2008,8 @@ static struct sock *udp_get_first(struct - sk_nulls_for_each(sk, node, &hslot->head) { +@@ -2291,6 +2322,8 @@ static struct sock *udp_get_first(struct + sk_for_each(sk, &hslot->head) { if (!net_eq(sock_net(sk), net)) continue; + if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) @@ -24961,10 +23975,10 @@ diff -NurpP --minimal linux-3.7/net/ipv4/udp.c linux-3.7-vs2.3.5.1/net/ipv4/udp. if (sk->sk_family == state->family) goto found; } -@@ -2009,7 +2027,9 @@ static struct sock *udp_get_next(struct +@@ -2308,7 +2341,9 @@ static struct sock *udp_get_next(struct do { - sk = sk_nulls_next(sk); + sk = sk_next(sk); - } while (sk && (!net_eq(sock_net(sk), net) || sk->sk_family != state->family)); + } while (sk && (!net_eq(sock_net(sk), net) || + sk->sk_family != state->family || @@ -24972,8 +23986,8 @@ diff -NurpP --minimal linux-3.7/net/ipv4/udp.c linux-3.7-vs2.3.5.1/net/ipv4/udp. if (!sk) { if (state->bucket <= state->udp_table->mask) -@@ -2105,8 +2125,8 @@ static void udp4_format_sock(struct sock - int bucket, int *len) +@@ -2404,8 +2439,8 @@ static void udp4_format_sock(struct sock + int bucket) { struct inet_sock *inet = inet_sk(sp); - __be32 dest = inet->inet_daddr; @@ -24983,51 +23997,114 @@ diff -NurpP --minimal linux-3.7/net/ipv4/udp.c linux-3.7-vs2.3.5.1/net/ipv4/udp. __u16 destp = ntohs(inet->inet_dport); __u16 srcp = ntohs(inet->inet_sport); -diff -NurpP --minimal linux-3.7/net/ipv6/Kconfig linux-3.7-vs2.3.5.1/net/ipv6/Kconfig ---- linux-3.7/net/ipv6/Kconfig 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/Kconfig 2012-12-11 15:56:33.000000000 +0000 -@@ -4,8 +4,8 @@ +diff -urNp -x '*.orig' linux-4.9/net/ipv4/udp_diag.c linux-4.9/net/ipv4/udp_diag.c +--- linux-4.9/net/ipv4/udp_diag.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/net/ipv4/udp_diag.c 2021-02-24 15:47:45.137744347 +0100 +@@ -120,6 +120,8 @@ static void udp_dump(struct udp_table *t - # IPv6 as module will cause a CRASH if you try to unload it - menuconfig IPV6 -- tristate "The IPv6 protocol" -- default m -+ bool "The IPv6 protocol" -+ default n - ---help--- - This is complemental support for the IP version 6. - You will still be able to do traditional IPv4 networking as well. -diff -NurpP --minimal linux-3.7/net/ipv6/addrconf.c linux-3.7-vs2.3.5.1/net/ipv6/addrconf.c ---- linux-3.7/net/ipv6/addrconf.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/addrconf.c 2012-12-11 15:56:33.000000000 +0000 -@@ -92,6 +92,8 @@ + if (!net_eq(sock_net(sk), net)) + continue; ++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) ++ continue; + if (num < s_num) + goto next; + if (!(r->idiag_states & (1 << sk->sk_state))) +diff -urNp -x '*.orig' linux-4.9/net/ipv6/addrconf.c linux-4.9/net/ipv6/addrconf.c +--- linux-4.9/net/ipv6/addrconf.c 2021-02-24 15:47:32.607352350 +0100 ++++ linux-4.9/net/ipv6/addrconf.c 2021-02-24 15:47:45.141077785 +0100 +@@ -92,6 +92,7 @@ #include #include #include +#include -+#include /* Set to 3 to get tracing... */ #define ACONF_DEBUG 2 -@@ -1094,7 +1096,7 @@ out: +@@ -1498,7 +1499,8 @@ static int __ipv6_dev_get_saddr(struct n + struct ipv6_saddr_dst *dst, + struct inet6_dev *idev, + struct ipv6_saddr_score *scores, +- int hiscore_idx) ++ int hiscore_idx, ++ struct nx_info *nxi) + { + struct ipv6_saddr_score *score = &scores[1 - hiscore_idx], *hiscore = &scores[hiscore_idx]; + +@@ -1528,6 +1530,8 @@ static int __ipv6_dev_get_saddr(struct n + idev->dev->name); + continue; + } ++ if (!v6_addr_in_nx_info(nxi, &score->ifa->addr, -1)) ++ continue; + + score->rule = -1; + bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX); +@@ -1578,26 +1582,27 @@ static int ipv6_get_saddr_master(struct + const struct net_device *master, + struct ipv6_saddr_dst *dst, + struct ipv6_saddr_score *scores, +- int hiscore_idx) ++ int hiscore_idx, ++ struct nx_info *nxi) + { + struct inet6_dev *idev; + + idev = __in6_dev_get(dst_dev); + if (idev) +- hiscore_idx = __ipv6_dev_get_saddr(net, dst, idev, +- scores, hiscore_idx); ++ hiscore_idx = __ipv6_dev_get_saddr(net, dst, ++ idev, scores, hiscore_idx, nxi); + + idev = __in6_dev_get(master); + if (idev) +- hiscore_idx = __ipv6_dev_get_saddr(net, dst, idev, +- scores, hiscore_idx); ++ hiscore_idx = __ipv6_dev_get_saddr(net, dst, ++ idev, scores, hiscore_idx, nxi); + + return hiscore_idx; + } int ipv6_dev_get_saddr(struct net *net, const struct net_device *dst_dev, const struct in6_addr *daddr, unsigned int prefs, - struct in6_addr *saddr) + struct in6_addr *saddr, struct nx_info *nxi) { - struct ipv6_saddr_score scores[2], - *score = &scores[0], *hiscore = &scores[1]; -@@ -1166,6 +1168,8 @@ int ipv6_dev_get_saddr(struct net *net, - dev->name); + struct ipv6_saddr_score scores[2], *hiscore; + struct ipv6_saddr_dst dst; +@@ -1646,7 +1651,8 @@ int ipv6_dev_get_saddr(struct net *net, + + if (use_oif_addr) { + if (idev) +- hiscore_idx = __ipv6_dev_get_saddr(net, &dst, idev, scores, hiscore_idx); ++ hiscore_idx = __ipv6_dev_get_saddr(net, ++ &dst, idev, scores, hiscore_idx, nxi); + } else { + const struct net_device *master; + int master_idx = 0; +@@ -1660,8 +1666,8 @@ int ipv6_dev_get_saddr(struct net *net, + master_idx = master->ifindex; + + hiscore_idx = ipv6_get_saddr_master(net, dst_dev, +- master, &dst, +- scores, hiscore_idx); ++ master, &dst, scores, ++ hiscore_idx, nxi); + + if (scores[hiscore_idx].ifa) + goto out; +@@ -1676,7 +1682,8 @@ int ipv6_dev_get_saddr(struct net *net, + idev = __in6_dev_get(dev); + if (!idev) continue; - } -+ if (!v6_addr_in_nx_info(nxi, &score->ifa->addr, -1)) -+ continue; +- hiscore_idx = __ipv6_dev_get_saddr(net, &dst, idev, scores, hiscore_idx); ++ hiscore_idx = __ipv6_dev_get_saddr(net, ++ &dst, idev, scores, hiscore_idx, nxi); + } + } - score->rule = -1; - bitmap_zero(score->scorebits, IPV6_SADDR_RULE_MAX); -@@ -3135,7 +3139,10 @@ static void if6_seq_stop(struct seq_file +@@ -4135,7 +4142,10 @@ static void if6_seq_stop(struct seq_file static int if6_seq_show(struct seq_file *seq, void *v) { struct inet6_ifaddr *ifp = (struct inet6_ifaddr *)v; @@ -25039,7 +24116,7 @@ diff -NurpP --minimal linux-3.7/net/ipv6/addrconf.c linux-3.7-vs2.3.5.1/net/ipv6 &ifp->addr, ifp->idev->dev->ifindex, ifp->prefix_len, -@@ -3641,6 +3648,11 @@ static int in6_dump_addrs(struct inet6_d +@@ -4719,6 +4729,11 @@ static int in6_dump_addrs(struct inet6_d struct ifacaddr6 *ifaca; int err = 1; int ip_idx = *p_ip_idx; @@ -25051,47 +24128,54 @@ diff -NurpP --minimal linux-3.7/net/ipv6/addrconf.c linux-3.7-vs2.3.5.1/net/ipv6 read_lock_bh(&idev->lock); switch (type) { -@@ -3651,6 +3663,8 @@ static int in6_dump_addrs(struct inet6_d +@@ -4729,6 +4744,8 @@ static int in6_dump_addrs(struct inet6_d list_for_each_entry(ifa, &idev->addr_list, if_list) { - if (++ip_idx < s_ip_idx) - continue; -+ if (!v6_addr_in_nx_info(nxi, &ifa->addr, -1)) -+ continue; + if (ip_idx < s_ip_idx) + goto next; ++ if (!v6_addr_in_nx_info(nxi, &ifa->addr, -1)) ++ goto next; err = inet6_fill_ifaddr(skb, ifa, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, -@@ -3667,6 +3681,8 @@ static int in6_dump_addrs(struct inet6_d +@@ -4748,6 +4765,8 @@ next: ifmca = ifmca->next, ip_idx++) { if (ip_idx < s_ip_idx) continue; -+ if (!v6_addr_in_nx_info(nxi, &ifmca->mca_addr, -1)) -+ continue; ++ if (!v6_addr_in_nx_info(nxi, &ifmca->mca_addr, -1)) ++ continue; err = inet6_fill_ifmcaddr(skb, ifmca, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, -@@ -3682,6 +3698,8 @@ static int in6_dump_addrs(struct inet6_d +@@ -4763,6 +4782,8 @@ next: ifaca = ifaca->aca_next, ip_idx++) { if (ip_idx < s_ip_idx) continue; -+ if (!v6_addr_in_nx_info(nxi, &ifaca->aca_addr, -1)) -+ continue; ++ if (!v6_addr_in_nx_info(nxi, &ifaca->aca_addr, -1)) ++ continue; err = inet6_fill_ifacaddr(skb, ifaca, NETLINK_CB(cb->skb).portid, cb->nlh->nlmsg_seq, -@@ -4065,6 +4083,11 @@ static int inet6_dump_ifinfo(struct sk_b +@@ -4791,6 +4812,10 @@ static int inet6_dump_addr(struct sk_buf struct inet6_dev *idev; struct hlist_head *head; - struct hlist_node *node; -+ struct nx_info *nxi = skb->sk ? skb->sk->sk_nx_info : NULL; -+ + + /* FIXME: maybe disable ipv6 on non v6 guests? + if (skb->sk && skb->sk->sk_vx_info) + return skb->len; */ ++ + s_h = cb->args[0]; + s_idx = idx = cb->args[1]; + s_ip_idx = ip_idx = cb->args[2]; +@@ -5309,6 +5334,7 @@ static int inet6_dump_ifinfo(struct sk_b + struct net_device *dev; + struct inet6_dev *idev; + struct hlist_head *head; ++ struct nx_info *nxi = skb->sk ? skb->sk->sk_nx_info : NULL; s_h = cb->args[0]; s_idx = cb->args[1]; -@@ -4076,6 +4099,8 @@ static int inet6_dump_ifinfo(struct sk_b - hlist_for_each_entry_rcu(dev, node, head, index_hlist) { +@@ -5320,6 +5346,8 @@ static int inet6_dump_ifinfo(struct sk_b + hlist_for_each_entry_rcu(dev, head, index_hlist) { if (idx < s_idx) goto cont; + if (!v6_dev_in_nx_info(dev, nxi)) @@ -25099,41 +24183,41 @@ diff -NurpP --minimal linux-3.7/net/ipv6/addrconf.c linux-3.7-vs2.3.5.1/net/ipv6 idev = __in6_dev_get(dev); if (!idev) goto cont; -diff -NurpP --minimal linux-3.7/net/ipv6/af_inet6.c linux-3.7-vs2.3.5.1/net/ipv6/af_inet6.c ---- linux-3.7/net/ipv6/af_inet6.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/af_inet6.c 2012-12-11 15:56:33.000000000 +0000 -@@ -43,6 +43,8 @@ +diff -urNp -x '*.orig' linux-4.9/net/ipv6/af_inet6.c linux-4.9/net/ipv6/af_inet6.c +--- linux-4.9/net/ipv6/af_inet6.c 2021-02-24 15:47:32.607352350 +0100 ++++ linux-4.9/net/ipv6/af_inet6.c 2021-02-24 15:47:45.141077785 +0100 +@@ -43,6 +43,7 @@ #include #include #include +#include -+#include #include #include -@@ -160,9 +162,12 @@ lookup_protocol: +@@ -167,10 +168,13 @@ lookup_protocol: } err = -EPERM; + if ((protocol == IPPROTO_ICMPV6) && + nx_capable(CAP_NET_RAW, NXC_RAW_ICMP)) + goto override; - if (sock->type == SOCK_RAW && !kern && !capable(CAP_NET_RAW)) + if (sock->type == SOCK_RAW && !kern && + !ns_capable(net->user_ns, CAP_NET_RAW)) goto out_rcu_unlock; - +override: sock->ops = answer->ops; answer_prot = answer->prot; - answer_no_check = answer->no_check; -@@ -262,6 +267,7 @@ int inet6_bind(struct socket *sock, stru + answer_flags = answer->flags; +@@ -272,6 +276,7 @@ int inet6_bind(struct socket *sock, stru struct inet_sock *inet = inet_sk(sk); struct ipv6_pinfo *np = inet6_sk(sk); struct net *net = sock_net(sk); + struct nx_v6_sock_addr nsa; __be32 v4addr = 0; unsigned short snum; - int addr_type = 0; -@@ -277,6 +283,10 @@ int inet6_bind(struct socket *sock, stru + bool saved_ipv6only; +@@ -288,6 +293,10 @@ int inet6_bind(struct socket *sock, stru if (addr->sin6_family != AF_INET6) return -EAFNOSUPPORT; @@ -25144,15 +24228,7 @@ diff -NurpP --minimal linux-3.7/net/ipv6/af_inet6.c linux-3.7-vs2.3.5.1/net/ipv6 addr_type = ipv6_addr_type(&addr->sin6_addr); if ((addr_type & IPV6_ADDR_MULTICAST) && sock->type == SOCK_STREAM) return -EINVAL; -@@ -308,6 +318,7 @@ int inet6_bind(struct socket *sock, stru - /* Reproduce AF_INET checks to make the bindings consistent */ - v4addr = addr->sin6_addr.s6_addr32[3]; - chk_addr_ret = inet_addr_type(net, v4addr); -+ - if (!sysctl_ip_nonlocal_bind && - !(inet->freebind || inet->transparent) && - v4addr != htonl(INADDR_ANY) && -@@ -317,6 +328,10 @@ int inet6_bind(struct socket *sock, stru +@@ -340,6 +349,10 @@ int inet6_bind(struct socket *sock, stru err = -EADDRNOTAVAIL; goto out; } @@ -25163,7 +24239,7 @@ diff -NurpP --minimal linux-3.7/net/ipv6/af_inet6.c linux-3.7-vs2.3.5.1/net/ipv6 } else { if (addr_type != IPV6_ADDR_ANY) { struct net_device *dev = NULL; -@@ -343,6 +358,11 @@ int inet6_bind(struct socket *sock, stru +@@ -369,6 +382,11 @@ int inet6_bind(struct socket *sock, stru } } @@ -25175,7 +24251,7 @@ diff -NurpP --minimal linux-3.7/net/ipv6/af_inet6.c linux-3.7-vs2.3.5.1/net/ipv6 /* ipv4 addr of the socket is invalid. Only the * unspecified and mapped address have a v4 equivalent. */ -@@ -359,6 +379,9 @@ int inet6_bind(struct socket *sock, stru +@@ -386,6 +404,9 @@ int inet6_bind(struct socket *sock, stru } } @@ -25185,22 +24261,22 @@ diff -NurpP --minimal linux-3.7/net/ipv6/af_inet6.c linux-3.7-vs2.3.5.1/net/ipv6 inet->inet_rcv_saddr = v4addr; inet->inet_saddr = v4addr; -@@ -460,9 +483,11 @@ int inet6_getname(struct socket *sock, s +@@ -492,9 +513,11 @@ int inet6_getname(struct socket *sock, s return -ENOTCONN; sin->sin6_port = inet->inet_dport; - sin->sin6_addr = np->daddr; + sin->sin6_addr = sk->sk_v6_daddr; + /* FIXME: remap lback? */ if (np->sndflow) sin->sin6_flowinfo = np->flow_label; } else { + /* FIXME: remap lback? */ - if (ipv6_addr_any(&np->rcv_saddr)) + if (ipv6_addr_any(&sk->sk_v6_rcv_saddr)) sin->sin6_addr = np->saddr; else -diff -NurpP --minimal linux-3.7/net/ipv6/datagram.c linux-3.7-vs2.3.5.1/net/ipv6/datagram.c ---- linux-3.7/net/ipv6/datagram.c 2012-07-22 21:39:48.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/datagram.c 2012-12-11 15:56:33.000000000 +0000 -@@ -645,7 +645,7 @@ int datagram_send_ctl(struct net *net, s +diff -urNp -x '*.orig' linux-4.9/net/ipv6/datagram.c linux-4.9/net/ipv6/datagram.c +--- linux-4.9/net/ipv6/datagram.c 2021-02-24 15:47:32.610685787 +0100 ++++ linux-4.9/net/ipv6/datagram.c 2021-02-24 15:47:45.141077785 +0100 +@@ -792,7 +792,7 @@ int ip6_datagram_send_ctl(struct net *ne rcu_read_lock(); if (fl6->flowi6_oif) { @@ -25209,10 +24285,10 @@ diff -NurpP --minimal linux-3.7/net/ipv6/datagram.c linux-3.7-vs2.3.5.1/net/ipv6 if (!dev) { rcu_read_unlock(); return -ENODEV; -diff -NurpP --minimal linux-3.7/net/ipv6/fib6_rules.c linux-3.7-vs2.3.5.1/net/ipv6/fib6_rules.c ---- linux-3.7/net/ipv6/fib6_rules.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/fib6_rules.c 2012-12-11 15:56:33.000000000 +0000 -@@ -90,7 +90,7 @@ static int fib6_rule_action(struct fib_r +diff -urNp -x '*.orig' linux-4.9/net/ipv6/fib6_rules.c linux-4.9/net/ipv6/fib6_rules.c +--- linux-4.9/net/ipv6/fib6_rules.c 2021-02-24 15:47:32.610685787 +0100 ++++ linux-4.9/net/ipv6/fib6_rules.c 2021-02-24 15:47:45.141077785 +0100 +@@ -102,7 +102,7 @@ static int fib6_rule_action(struct fib_r ip6_dst_idev(&rt->dst)->dev, &flp6->daddr, rt6_flags2srcprefs(flags), @@ -25221,49 +24297,134 @@ diff -NurpP --minimal linux-3.7/net/ipv6/fib6_rules.c linux-3.7-vs2.3.5.1/net/ip goto again; if (!ipv6_prefix_equal(&saddr, &r->src.addr, r->src.plen)) -diff -NurpP --minimal linux-3.7/net/ipv6/inet6_hashtables.c linux-3.7-vs2.3.5.1/net/ipv6/inet6_hashtables.c ---- linux-3.7/net/ipv6/inet6_hashtables.c 2011-10-24 16:45:34.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/inet6_hashtables.c 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/net/ipv6/inet6_hashtables.c linux-4.9/net/ipv6/inet6_hashtables.c +--- linux-4.9/net/ipv6/inet6_hashtables.c 2021-02-24 15:47:32.610685787 +0100 ++++ linux-4.9/net/ipv6/inet6_hashtables.c 2021-02-24 15:47:45.141077785 +0100 @@ -16,6 +16,7 @@ #include #include +#include + #include #include - #include -@@ -83,7 +84,6 @@ struct sock *__inet6_lookup_established( - unsigned int slot = hash & hashinfo->ehash_mask; - struct inet_ehash_bucket *head = &hashinfo->ehash[slot]; - -- - rcu_read_lock(); - begin: - sk_nulls_for_each_rcu(sk, node, &head->chain) { -@@ -95,7 +95,7 @@ begin: - sock_put(sk); - goto begin; - } -- goto out; -+ goto out; - } - } - if (get_nulls_value(node) != slot) -@@ -141,6 +141,9 @@ static inline int compute_score(struct s - if (!ipv6_addr_equal(&np->rcv_saddr, daddr)) +@@ -108,6 +109,9 @@ static inline int compute_score(struct s + if (!ipv6_addr_equal(&sk->sk_v6_rcv_saddr, daddr)) return -1; score++; + } else { + if (!v6_addr_in_nx_info(sk->sk_nx_info, daddr, -1)) + return -1; } - if (sk->sk_bound_dev_if) { + if (sk->sk_bound_dev_if || exact_dif) { if (sk->sk_bound_dev_if != dif) -diff -NurpP --minimal linux-3.7/net/ipv6/ip6_output.c linux-3.7-vs2.3.5.1/net/ipv6/ip6_output.c ---- linux-3.7/net/ipv6/ip6_output.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/ip6_output.c 2012-12-11 15:56:33.000000000 +0000 -@@ -964,7 +964,8 @@ static int ip6_dst_lookup_tail(struct so - struct rt6_info *rt = (struct rt6_info *) *dst; +@@ -283,39 +287,71 @@ EXPORT_SYMBOL_GPL(inet6_hash); + * IPV6_ADDR_ANY only equals to IPV6_ADDR_ANY, + * and 0.0.0.0 equals to 0.0.0.0 only + */ +-int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2, ++int ipv6_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2, + bool match_wildcard) + { ++ const struct in6_addr *sk1_rcv_saddr6 = inet6_rcv_saddr(sk1); + const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2); ++ __be32 sk1_rcv_saddr = sk1->sk_rcv_saddr; ++ __be32 sk2_rcv_saddr = sk2->sk_rcv_saddr; ++ int sk1_ipv6only = inet_v6_ipv6only(sk1); + int sk2_ipv6only = inet_v6_ipv6only(sk2); +- int addr_type = ipv6_addr_type(&sk->sk_v6_rcv_saddr); ++ int addr_type1 = ipv6_addr_type(sk1_rcv_saddr6); + int addr_type2 = sk2_rcv_saddr6 ? ipv6_addr_type(sk2_rcv_saddr6) : IPV6_ADDR_MAPPED; + ++ ++ /* if one is mapped and the other is ipv6only exit early */ ++ if (addr_type1 == IPV6_ADDR_MAPPED && sk2_ipv6only) ++ return 0; ++ ++ if (addr_type2 == IPV6_ADDR_MAPPED && sk1_ipv6only) ++ return 0; ++ + /* if both are mapped, treat as IPv4 */ +- if (addr_type == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED) { +- if (!sk2_ipv6only) { +- if (sk->sk_rcv_saddr == sk2->sk_rcv_saddr) +- return 1; +- if (!sk->sk_rcv_saddr || !sk2->sk_rcv_saddr) +- return match_wildcard; +- } ++ if (addr_type1 == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED) { ++ if (sk1_rcv_saddr == sk2_rcv_saddr) ++ return 1; ++ if ((!sk1_rcv_saddr || !sk2_rcv_saddr) && match_wildcard) ++ goto vs_v4; + return 0; + } + +- if (addr_type == IPV6_ADDR_ANY && addr_type2 == IPV6_ADDR_ANY) ++ /* if both are wildcards, check for overlap */ ++ if (addr_type1 == IPV6_ADDR_ANY && addr_type2 == IPV6_ADDR_ANY) ++ return nx_v6_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info); ++ ++ /* if both are valid ipv6 addresses, mapped handled above */ ++ if (addr_type1 != IPV6_ADDR_ANY && addr_type2 != IPV6_ADDR_ANY && ++ sk2_rcv_saddr6 && ipv6_addr_equal(sk1_rcv_saddr6, sk2_rcv_saddr6)) + return 1; + +- if (addr_type2 == IPV6_ADDR_ANY && match_wildcard && +- !(sk2_ipv6only && addr_type == IPV6_ADDR_MAPPED)) +- return 1; ++ if (addr_type1 == IPV6_ADDR_ANY && match_wildcard) { ++ /* ipv6only case handled above */ ++ if (addr_type2 == IPV6_ADDR_MAPPED) ++ return v4_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr, -1); ++ else ++ return v6_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr6, -1); ++ } + +- if (addr_type == IPV6_ADDR_ANY && match_wildcard && +- !(ipv6_only_sock(sk) && addr_type2 == IPV6_ADDR_MAPPED)) +- return 1; ++ if (addr_type2 == IPV6_ADDR_ANY && match_wildcard) { ++ /* ipv6only case handled above */ ++ if (addr_type1 == IPV6_ADDR_MAPPED) ++ return v4_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr, -1); ++ else ++ return v6_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr6, -1); ++ } + +- if (sk2_rcv_saddr6 && +- ipv6_addr_equal(&sk->sk_v6_rcv_saddr, sk2_rcv_saddr6)) +- return 1; ++ return 0; ++ ++vs_v4: ++ if (!sk1_rcv_saddr && !sk2_rcv_saddr) ++ return nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info); ++ ++ if (!sk2_rcv_saddr) ++ return v4_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr, -1); ++ ++ if (!sk1_rcv_saddr) ++ return v4_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr, -1); + + return 0; + } +diff -urNp -x '*.orig' linux-4.9/net/ipv6/ip6_fib.c linux-4.9/net/ipv6/ip6_fib.c +--- linux-4.9/net/ipv6/ip6_fib.c 2021-02-24 15:47:32.610685787 +0100 ++++ linux-4.9/net/ipv6/ip6_fib.c 2021-02-24 15:47:45.141077785 +0100 +@@ -1977,6 +1977,7 @@ static int ipv6_route_seq_show(struct se + struct rt6_info *rt = v; + struct ipv6_route_iter *iter = seq->private; + ++ /* FIXME: check for network context? */ + seq_printf(seq, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen); + + #ifdef CONFIG_IPV6_SUBTREES +diff -urNp -x '*.orig' linux-4.9/net/ipv6/ip6_output.c linux-4.9/net/ipv6/ip6_output.c +--- linux-4.9/net/ipv6/ip6_output.c 2021-02-24 15:47:33.077367054 +0100 ++++ linux-4.9/net/ipv6/ip6_output.c 2021-02-24 15:47:45.141077785 +0100 +@@ -966,7 +966,8 @@ static int ip6_dst_lookup_tail(struct ne + rt = (*dst)->error ? NULL : (struct rt6_info *)*dst; err = ip6_route_get_saddr(net, rt, &fl6->daddr, sk ? inet6_sk(sk)->srcprefs : 0, - &fl6->saddr); @@ -25271,11 +24432,23 @@ diff -NurpP --minimal linux-3.7/net/ipv6/ip6_output.c linux-3.7-vs2.3.5.1/net/ip + sk ? sk->sk_nx_info : NULL); if (err) goto out_err_release; + +diff -urNp -x '*.orig' linux-4.9/net/ipv6/ip6_tunnel.c linux-4.9/net/ipv6/ip6_tunnel.c +--- linux-4.9/net/ipv6/ip6_tunnel.c 2021-02-24 15:47:32.614019225 +0100 ++++ linux-4.9/net/ipv6/ip6_tunnel.c 2021-02-24 15:47:45.141077785 +0100 +@@ -1124,7 +1124,7 @@ route_lookup: + } + if (t->parms.collect_md && + ipv6_dev_get_saddr(net, ip6_dst_idev(dst)->dev, +- &fl6->daddr, 0, &fl6->saddr)) ++ &fl6->daddr, 0, &fl6->saddr, NULL)) + goto tx_err_link_failure; + ndst = dst; } -diff -NurpP --minimal linux-3.7/net/ipv6/ndisc.c linux-3.7-vs2.3.5.1/net/ipv6/ndisc.c ---- linux-3.7/net/ipv6/ndisc.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/ndisc.c 2012-12-11 15:56:33.000000000 +0000 -@@ -517,7 +517,7 @@ static void ndisc_send_na(struct net_dev +diff -urNp -x '*.orig' linux-4.9/net/ipv6/ndisc.c linux-4.9/net/ipv6/ndisc.c +--- linux-4.9/net/ipv6/ndisc.c 2021-02-24 15:47:32.614019225 +0100 ++++ linux-4.9/net/ipv6/ndisc.c 2021-02-24 15:47:45.141077785 +0100 +@@ -512,7 +512,7 @@ void ndisc_send_na(struct net_device *de } else { if (ipv6_dev_get_saddr(dev_net(dev), dev, daddr, inet6_sk(dev_net(dev)->ipv6.ndisc_sk)->srcprefs, @@ -25284,222 +24457,106 @@ diff -NurpP --minimal linux-3.7/net/ipv6/ndisc.c linux-3.7-vs2.3.5.1/net/ipv6/nd return; src_addr = &tmpaddr; } -diff -NurpP --minimal linux-3.7/net/ipv6/raw.c linux-3.7-vs2.3.5.1/net/ipv6/raw.c ---- linux-3.7/net/ipv6/raw.c 2012-12-11 15:47:54.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/raw.c 2012-12-11 15:56:33.000000000 +0000 -@@ -30,6 +30,7 @@ - #include - #include - #include -+#include - #include - #include - #include -@@ -284,6 +285,13 @@ static int rawv6_bind(struct sock *sk, s +diff -urNp -x '*.orig' linux-4.9/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c linux-4.9/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c +--- linux-4.9/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/net/ipv6/netfilter/nf_nat_masquerade_ipv6.c 2021-02-24 15:47:45.141077785 +0100 +@@ -39,7 +39,7 @@ nf_nat_masquerade_ipv6(struct sk_buff *s + ctinfo == IP_CT_RELATED_REPLY)); + + if (ipv6_dev_get_saddr(nf_ct_net(ct), out, +- &ipv6_hdr(skb)->daddr, 0, &src) < 0) ++ &ipv6_hdr(skb)->daddr, 0, &src, NULL) < 0) + return NF_DROP; + + nfct_nat(ct)->masq_index = out->ifindex; +diff -urNp -x '*.orig' linux-4.9/net/ipv6/raw.c linux-4.9/net/ipv6/raw.c +--- linux-4.9/net/ipv6/raw.c 2021-02-24 15:47:32.617352663 +0100 ++++ linux-4.9/net/ipv6/raw.c 2021-02-24 15:47:45.141077785 +0100 +@@ -293,6 +293,13 @@ static int rawv6_bind(struct sock *sk, s goto out_unlock; } + if (!v6_addr_in_nx_info(sk->sk_nx_info, &addr->sin6_addr, -1)) { + err = -EADDRNOTAVAIL; -+ if (dev) -+ dev_put(dev); -+ goto out; -+ } -+ - /* ipv4 addr of the socket is invalid. Only the - * unspecified and mapped address have a v4 equivalent. - */ -diff -NurpP --minimal linux-3.7/net/ipv6/route.c linux-3.7-vs2.3.5.1/net/ipv6/route.c ---- linux-3.7/net/ipv6/route.c 2012-12-11 15:47:55.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/route.c 2012-12-11 15:56:33.000000000 +0000 -@@ -57,6 +57,7 @@ - #include - #include - #include -+#include - - #include - -@@ -2116,15 +2117,17 @@ int ip6_route_get_saddr(struct net *net, - struct rt6_info *rt, - const struct in6_addr *daddr, - unsigned int prefs, -- struct in6_addr *saddr) -+ struct in6_addr *saddr, -+ struct nx_info *nxi) - { - struct inet6_dev *idev = ip6_dst_idev((struct dst_entry*)rt); - int err = 0; -- if (rt->rt6i_prefsrc.plen) -+ if (rt->rt6i_prefsrc.plen && (!nxi || -+ v6_addr_in_nx_info(nxi, &rt->rt6i_prefsrc.addr, NXA_TYPE_ADDR))) - *saddr = rt->rt6i_prefsrc.addr; - else - err = ipv6_dev_get_saddr(net, idev ? idev->dev : NULL, -- daddr, prefs, saddr); -+ daddr, prefs, saddr, nxi); - return err; - } - -@@ -2478,7 +2481,8 @@ static int rt6_fill_node(struct net *net - goto nla_put_failure; - } else if (dst) { - struct in6_addr saddr_buf; -- if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf) == 0 && -+ if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf, -+ (skb->sk ? skb->sk->sk_nx_info : NULL)) == 0 && - nla_put(skb, RTA_PREFSRC, 16, &saddr_buf)) - goto nla_put_failure; - } -@@ -2692,6 +2696,7 @@ static int rt6_info_route(struct rt6_inf - struct seq_file *m = p_arg; - struct neighbour *n; - -+ /* FIXME: check for network context? */ - seq_printf(m, "%pi6 %02x ", &rt->rt6i_dst.addr, rt->rt6i_dst.plen); - - #ifdef CONFIG_IPV6_SUBTREES -diff -NurpP --minimal linux-3.7/net/ipv6/tcp_ipv6.c linux-3.7-vs2.3.5.1/net/ipv6/tcp_ipv6.c ---- linux-3.7/net/ipv6/tcp_ipv6.c 2012-12-11 15:47:55.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/tcp_ipv6.c 2012-12-11 15:56:33.000000000 +0000 -@@ -71,6 +71,7 @@ - - #include - #include -+#include - - static void tcp_v6_send_reset(struct sock *sk, struct sk_buff *skb); - static void tcp_v6_reqsk_send_ack(struct sock *sk, struct sk_buff *skb, -@@ -175,8 +176,15 @@ static int tcp_v6_connect(struct sock *s - * connect() to INADDR_ANY means loopback (BSD'ism). - */ - -- if(ipv6_addr_any(&usin->sin6_addr)) -- usin->sin6_addr.s6_addr[15] = 0x1; -+ if(ipv6_addr_any(&usin->sin6_addr)) { -+ struct nx_info *nxi = sk->sk_nx_info; -+ -+ if (nxi && nx_info_has_v6(nxi)) -+ /* FIXME: remap lback? */ -+ usin->sin6_addr = nxi->v6.ip; -+ else -+ usin->sin6_addr.s6_addr[15] = 0x1; -+ } - - addr_type = ipv6_addr_type(&usin->sin6_addr); - -diff -NurpP --minimal linux-3.7/net/ipv6/udp.c linux-3.7-vs2.3.5.1/net/ipv6/udp.c ---- linux-3.7/net/ipv6/udp.c 2012-12-11 15:47:55.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/udp.c 2012-12-11 15:56:33.000000000 +0000 -@@ -45,42 +45,68 @@ - #include - #include - #include -+#include - - #include - #include - #include - #include "udp_impl.h" - --int ipv6_rcv_saddr_equal(const struct sock *sk, const struct sock *sk2) -+int ipv6_rcv_saddr_equal(const struct sock *sk1, const struct sock *sk2) - { -- const struct in6_addr *sk_rcv_saddr6 = &inet6_sk(sk)->rcv_saddr; -+ const struct in6_addr *sk1_rcv_saddr6 = &inet6_sk(sk1)->rcv_saddr; - const struct in6_addr *sk2_rcv_saddr6 = inet6_rcv_saddr(sk2); -- __be32 sk1_rcv_saddr = sk_rcv_saddr(sk); -+ __be32 sk1_rcv_saddr = sk_rcv_saddr(sk1); - __be32 sk2_rcv_saddr = sk_rcv_saddr(sk2); -- int sk_ipv6only = ipv6_only_sock(sk); -+ int sk1_ipv6only = ipv6_only_sock(sk1); - int sk2_ipv6only = inet_v6_ipv6only(sk2); -- int addr_type = ipv6_addr_type(sk_rcv_saddr6); -+ int addr_type = ipv6_addr_type(sk1_rcv_saddr6); - int addr_type2 = sk2_rcv_saddr6 ? ipv6_addr_type(sk2_rcv_saddr6) : IPV6_ADDR_MAPPED; - - /* if both are mapped, treat as IPv4 */ -- if (addr_type == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED) -- return (!sk2_ipv6only && -+ if (addr_type == IPV6_ADDR_MAPPED && addr_type2 == IPV6_ADDR_MAPPED) { -+ if (!sk2_ipv6only && - (!sk1_rcv_saddr || !sk2_rcv_saddr || -- sk1_rcv_saddr == sk2_rcv_saddr)); -+ sk1_rcv_saddr == sk2_rcv_saddr)) -+ goto vs_v4; -+ else -+ return 0; -+ } - - if (addr_type2 == IPV6_ADDR_ANY && - !(sk2_ipv6only && addr_type == IPV6_ADDR_MAPPED)) -- return 1; -+ goto vs; - - if (addr_type == IPV6_ADDR_ANY && -- !(sk_ipv6only && addr_type2 == IPV6_ADDR_MAPPED)) -- return 1; -+ !(sk1_ipv6only && addr_type2 == IPV6_ADDR_MAPPED)) -+ goto vs; - - if (sk2_rcv_saddr6 && -- ipv6_addr_equal(sk_rcv_saddr6, sk2_rcv_saddr6)) -- return 1; -+ ipv6_addr_equal(sk1_rcv_saddr6, sk2_rcv_saddr6)) -+ goto vs; ++ if (dev) ++ dev_put(dev); ++ goto out; ++ } ++ + /* ipv4 addr of the socket is invalid. Only the + * unspecified and mapped address have a v4 equivalent. + */ +diff -urNp -x '*.orig' linux-4.9/net/ipv6/route.c linux-4.9/net/ipv6/route.c +--- linux-4.9/net/ipv6/route.c 2021-02-24 15:47:32.617352663 +0100 ++++ linux-4.9/net/ipv6/route.c 2021-02-24 15:47:45.144411223 +0100 +@@ -3297,7 +3297,8 @@ static int rt6_fill_node(struct net *net + goto nla_put_failure; + } else if (dst) { + struct in6_addr saddr_buf; +- if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf) == 0 && ++ if (ip6_route_get_saddr(net, rt, dst, 0, &saddr_buf, ++ (skb->sk ? skb->sk->sk_nx_info : NULL)) == 0 && + nla_put_in6_addr(skb, RTA_PREFSRC, &saddr_buf)) + goto nla_put_failure; + } +diff -urNp -x '*.orig' linux-4.9/net/ipv6/tcp_ipv6.c linux-4.9/net/ipv6/tcp_ipv6.c +--- linux-4.9/net/ipv6/tcp_ipv6.c 2021-02-24 15:47:32.620686100 +0100 ++++ linux-4.9/net/ipv6/tcp_ipv6.c 2021-02-24 15:47:45.144411223 +0100 +@@ -149,11 +149,18 @@ static int tcp_v6_connect(struct sock *s + */ - return 0; + if (ipv6_addr_any(&usin->sin6_addr)) { +- if (ipv6_addr_v4mapped(&sk->sk_v6_rcv_saddr)) +- ipv6_addr_set_v4mapped(htonl(INADDR_LOOPBACK), +- &usin->sin6_addr); +- else +- usin->sin6_addr = in6addr_loopback; ++ struct nx_info *nxi = sk->sk_nx_info; + -+vs_v4: -+ if (!sk1_rcv_saddr && !sk2_rcv_saddr) -+ return nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info); -+ if (!sk2_rcv_saddr) -+ return v4_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr, -1); -+ if (!sk1_rcv_saddr) -+ return v4_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr, -1); -+ return 1; -+vs: -+ if (addr_type2 == IPV6_ADDR_ANY && addr_type == IPV6_ADDR_ANY) -+ return nx_v6_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info); -+ else if (addr_type2 == IPV6_ADDR_ANY) -+ return v6_addr_in_nx_info(sk2->sk_nx_info, sk1_rcv_saddr6, -1); -+ else if (addr_type == IPV6_ADDR_ANY) { -+ if (addr_type2 == IPV6_ADDR_MAPPED) -+ return nx_v4_addr_conflict(sk1->sk_nx_info, sk2->sk_nx_info); -+ else -+ return v6_addr_in_nx_info(sk1->sk_nx_info, sk2_rcv_saddr6, -1); -+ } -+ return 1; - } ++ if (nxi && nx_info_has_v6(nxi)) ++ /* FIXME: remap lback? */ ++ usin->sin6_addr = nxi->v6.ip; ++ else { ++ if (ipv6_addr_v4mapped(&sk->sk_v6_rcv_saddr)) ++ ipv6_addr_set_v4mapped(htonl(INADDR_LOOPBACK), ++ &usin->sin6_addr); ++ else ++ usin->sin6_addr = in6addr_loopback; ++ } + } - static unsigned int udp6_portaddr_hash(struct net *net, -@@ -144,6 +170,10 @@ static inline int compute_score(struct s - if (!ipv6_addr_equal(&np->rcv_saddr, daddr)) - return -1; - score++; + addr_type = ipv6_addr_type(&usin->sin6_addr); +diff -urNp -x '*.orig' linux-4.9/net/ipv6/udp.c linux-4.9/net/ipv6/udp.c +--- linux-4.9/net/ipv6/udp.c 2021-02-24 15:47:32.620686100 +0100 ++++ linux-4.9/net/ipv6/udp.c 2021-02-24 15:47:45.144411223 +0100 +@@ -135,6 +135,10 @@ static int compute_score(struct sock *sk + if (inet->inet_dport != sport) + return -1; + score++; + } else { + /* block non nx_info ips */ + if (!v6_addr_in_nx_info(sk->sk_nx_info, daddr, -1)) + return -1; - } - if (!ipv6_addr_any(&np->daddr)) { - if (!ipv6_addr_equal(&np->daddr, saddr)) -diff -NurpP --minimal linux-3.7/net/ipv6/xfrm6_policy.c linux-3.7-vs2.3.5.1/net/ipv6/xfrm6_policy.c ---- linux-3.7/net/ipv6/xfrm6_policy.c 2012-10-04 13:27:50.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/ipv6/xfrm6_policy.c 2012-12-11 15:56:33.000000000 +0000 -@@ -63,7 +63,7 @@ static int xfrm6_get_saddr(struct net *n + } + + if (!ipv6_addr_any(&sk->sk_v6_rcv_saddr)) { +diff -urNp -x '*.orig' linux-4.9/net/ipv6/xfrm6_policy.c linux-4.9/net/ipv6/xfrm6_policy.c +--- linux-4.9/net/ipv6/xfrm6_policy.c 2021-02-24 15:47:32.620686100 +0100 ++++ linux-4.9/net/ipv6/xfrm6_policy.c 2021-02-24 15:47:45.144411223 +0100 +@@ -64,7 +64,8 @@ static int xfrm6_get_saddr(struct net *n + return -EHOSTUNREACH; + dev = ip6_dst_idev(dst)->dev; - ipv6_dev_get_saddr(dev_net(dev), dev, - (struct in6_addr *)&daddr->a6, 0, -- (struct in6_addr *)&saddr->a6); -+ (struct in6_addr *)&saddr->a6, NULL); +- ipv6_dev_get_saddr(dev_net(dev), dev, &daddr->in6, 0, &saddr->in6); ++ ipv6_dev_get_saddr(dev_net(dev), dev, &daddr->in6, ++ 0, &saddr->in6, NULL); dst_release(dst); return 0; } -diff -NurpP --minimal linux-3.7/net/netfilter/ipvs/ip_vs_xmit.c linux-3.7-vs2.3.5.1/net/netfilter/ipvs/ip_vs_xmit.c ---- linux-3.7/net/netfilter/ipvs/ip_vs_xmit.c 2012-12-11 15:47:55.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/netfilter/ipvs/ip_vs_xmit.c 2012-12-11 15:56:33.000000000 +0000 -@@ -273,7 +273,7 @@ __ip_vs_route_output_v6(struct net *net, +diff -urNp -x '*.orig' linux-4.9/net/netfilter/ipvs/ip_vs_xmit.c linux-4.9/net/netfilter/ipvs/ip_vs_xmit.c +--- linux-4.9/net/netfilter/ipvs/ip_vs_xmit.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/net/netfilter/ipvs/ip_vs_xmit.c 2021-02-24 15:47:45.144411223 +0100 +@@ -381,7 +381,7 @@ __ip_vs_route_output_v6(struct net *net, return dst; if (ipv6_addr_any(&fl6.saddr) && ipv6_dev_get_saddr(net, ip6_dst_idev(dst)->dev, @@ -25508,123 +24565,93 @@ diff -NurpP --minimal linux-3.7/net/netfilter/ipvs/ip_vs_xmit.c linux-3.7-vs2.3. goto out_err; if (do_xfrm) { dst = xfrm_lookup(net, dst, flowi6_to_flowi(&fl6), NULL, 0); -diff -NurpP --minimal linux-3.7/net/netlink/af_netlink.c linux-3.7-vs2.3.5.1/net/netlink/af_netlink.c ---- linux-3.7/net/netlink/af_netlink.c 2012-12-11 15:47:56.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/netlink/af_netlink.c 2012-12-11 15:56:33.000000000 +0000 -@@ -55,6 +55,9 @@ - #include - #include - #include +diff -urNp -x '*.orig' linux-4.9/net/netlink/af_netlink.c linux-4.9/net/netlink/af_netlink.c +--- linux-4.9/net/netlink/af_netlink.c 2021-02-24 15:47:32.654020476 +0100 ++++ linux-4.9/net/netlink/af_netlink.c 2021-02-24 15:47:45.144411223 +0100 +@@ -63,6 +63,8 @@ + #include + #include + #include +#include +#include -+#include #include #include -@@ -1981,6 +1984,8 @@ static struct sock *netlink_seq_socket_i - sk_for_each(s, node, &hash->table[j]) { - if (sock_net(s) != seq_file_net(seq)) - continue; -+ if (!nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT)) -+ continue; - if (off == pos) { - iter->link = i; - iter->hash_idx = j; -@@ -2015,7 +2020,8 @@ static void *netlink_seq_next(struct seq - s = v; - do { - s = sk_next(s); -- } while (s && sock_net(s) != seq_file_net(seq)); -+ } while (s && (sock_net(s) != seq_file_net(seq) || -+ !nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))); - if (s) - return s; - -@@ -2027,7 +2033,8 @@ static void *netlink_seq_next(struct seq - - for (; j <= hash->mask; j++) { - s = sk_head(&hash->table[j]); -- while (s && sock_net(s) != seq_file_net(seq)) -+ while (s && (sock_net(s) != seq_file_net(seq) || -+ !nx_check(s->sk_nid, VS_WATCH_P | VS_IDENT))) - s = sk_next(s); - if (s) { - iter->link = i; -diff -NurpP --minimal linux-3.7/net/socket.c linux-3.7-vs2.3.5.1/net/socket.c ---- linux-3.7/net/socket.c 2012-12-11 15:47:57.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/socket.c 2012-12-11 15:56:33.000000000 +0000 -@@ -99,6 +99,10 @@ +@@ -2478,7 +2480,8 @@ static void *__netlink_seq_next(struct s + if (err) + return ERR_PTR(err); + } +- } while (sock_net(&nlk->sk) != seq_file_net(seq)); ++ } while ((sock_net(&nlk->sk) != seq_file_net(seq)) || ++ !nx_check(nlk->sk.sk_nid, VS_WATCH_P | VS_IDENT)); + + return nlk; + } +diff -urNp -x '*.orig' linux-4.9/net/packet/diag.c linux-4.9/net/packet/diag.c +--- linux-4.9/net/packet/diag.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/net/packet/diag.c 2021-02-24 15:47:45.144411223 +0100 +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + #include + #include + +@@ -201,6 +202,8 @@ static int packet_diag_dump(struct sk_bu + sk_for_each(sk, &net->packet.sklist) { + if (!net_eq(sock_net(sk), net)) + continue; ++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) ++ continue; + if (num < s_num) + goto next; + +diff -urNp -x '*.orig' linux-4.9/net/socket.c linux-4.9/net/socket.c +--- linux-4.9/net/socket.c 2021-02-24 15:47:32.680687977 +0100 ++++ linux-4.9/net/socket.c 2021-02-24 15:47:45.144411223 +0100 +@@ -100,10 +100,12 @@ #include #include -+#include +#include +#include +#include #include #include -@@ -619,6 +623,7 @@ static inline int __sock_sendmsg_nosec(s - struct msghdr *msg, size_t size) - { - struct sock_iocb *si = kiocb_to_siocb(iocb); -+ size_t len; - - sock_update_classid(sock->sk); +-#include + #include + #include + #include +@@ -619,8 +621,24 @@ EXPORT_SYMBOL(__sock_tx_timestamp); -@@ -627,7 +632,22 @@ static inline int __sock_sendmsg_nosec(s - si->msg = msg; - si->size = size; - -- return sock->ops->sendmsg(iocb, sock, msg, size); -+ len = sock->ops->sendmsg(iocb, sock, msg, size); + static inline int sock_sendmsg_nosec(struct socket *sock, struct msghdr *msg) + { +- int ret = sock->ops->sendmsg(sock, msg, msg_data_left(msg)); +- BUG_ON(ret == -EIOCBQUEUED); ++ size_t size = msg_data_left(msg); ++ int ret = sock->ops->sendmsg(sock, msg, size); ++#if 0 + if (sock->sk) { -+ if (len == size) -+ vx_sock_send(sock->sk, size); -+ else ++ if (!ret) + vx_sock_fail(sock->sk, size); ++ else ++ vx_sock_send(sock->sk, size); + } ++#endif + vxdprintk(VXD_CBIT(net, 7), -+ "__sock_sendmsg: %p[%p,%p,%p;%d/%d]:%d/%zu", -+ sock, sock->sk, -+ (sock->sk)?sock->sk->sk_nx_info:0, -+ (sock->sk)?sock->sk->sk_vx_info:0, -+ (sock->sk)?sock->sk->sk_xid:0, -+ (sock->sk)?sock->sk->sk_nid:0, -+ (unsigned int)size, len); -+ return len; - } - - static inline int __sock_sendmsg(struct kiocb *iocb, struct socket *sock, -@@ -783,6 +803,7 @@ static inline int __sock_recvmsg_nosec(s - struct msghdr *msg, size_t size, int flags) - { - struct sock_iocb *si = kiocb_to_siocb(iocb); -+ int len; - - sock_update_classid(sock->sk); - -@@ -792,7 +813,18 @@ static inline int __sock_recvmsg_nosec(s - si->size = size; - si->flags = flags; - -- return sock->ops->recvmsg(iocb, sock, msg, size, flags); -+ len = sock->ops->recvmsg(iocb, sock, msg, size, flags); -+ if ((len >= 0) && sock->sk) -+ vx_sock_recv(sock->sk, len); -+ vxdprintk(VXD_CBIT(net, 7), -+ "__sock_recvmsg: %p[%p,%p,%p;%d/%d]:%d/%d", ++ "sock_sendmsg_nosec: %p[%p,%p,%p;%d/%d]:%zu/%zu", + sock, sock->sk, + (sock->sk)?sock->sk->sk_nx_info:0, + (sock->sk)?sock->sk->sk_vx_info:0, + (sock->sk)?sock->sk->sk_xid:0, + (sock->sk)?sock->sk->sk_nid:0, -+ (unsigned int)size, len); -+ return len; ++ size, msg_data_left(msg)); + return ret; } - static inline int __sock_recvmsg(struct kiocb *iocb, struct socket *sock, -@@ -1277,6 +1309,13 @@ int __sock_create(struct net *net, int f +@@ -1110,6 +1128,13 @@ int __sock_create(struct net *net, int f if (type < 0 || type >= SOCK_MAX) return -EINVAL; @@ -25638,7 +24665,7 @@ diff -NurpP --minimal linux-3.7/net/socket.c linux-3.7-vs2.3.5.1/net/socket.c /* Compatibility. This uglymoron is moved from INET layer to here to avoid -@@ -1411,6 +1450,7 @@ SYSCALL_DEFINE3(socket, int, family, int +@@ -1240,6 +1265,7 @@ SYSCALL_DEFINE3(socket, int, family, int if (retval < 0) goto out; @@ -25646,7 +24673,7 @@ diff -NurpP --minimal linux-3.7/net/socket.c linux-3.7-vs2.3.5.1/net/socket.c retval = sock_map_fd(sock, flags & (O_CLOEXEC | O_NONBLOCK)); if (retval < 0) goto out_release; -@@ -1452,10 +1492,12 @@ SYSCALL_DEFINE4(socketpair, int, family, +@@ -1281,10 +1307,12 @@ SYSCALL_DEFINE4(socketpair, int, family, err = sock_create(family, type, protocol, &sock1); if (err < 0) goto out; @@ -25659,36 +24686,36 @@ diff -NurpP --minimal linux-3.7/net/socket.c linux-3.7-vs2.3.5.1/net/socket.c err = sock1->ops->socketpair(sock1, sock2); if (err < 0) -diff -NurpP --minimal linux-3.7/net/sunrpc/auth.c linux-3.7-vs2.3.5.1/net/sunrpc/auth.c ---- linux-3.7/net/sunrpc/auth.c 2012-10-04 13:27:51.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/sunrpc/auth.c 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/net/sunrpc/auth.c linux-4.9/net/sunrpc/auth.c +--- linux-4.9/net/sunrpc/auth.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/net/sunrpc/auth.c 2021-02-24 15:47:45.144411223 +0100 @@ -15,6 +15,7 @@ #include #include #include +#include - #ifdef RPC_DEBUG + #if IS_ENABLED(CONFIG_SUNRPC_DEBUG) # define RPCDBG_FACILITY RPCDBG_AUTH -@@ -481,6 +482,7 @@ rpcauth_lookupcred(struct rpc_auth *auth +@@ -630,6 +631,7 @@ rpcauth_lookupcred(struct rpc_auth *auth memset(&acred, 0, sizeof(acred)); acred.uid = cred->fsuid; acred.gid = cred->fsgid; -+ acred.tag = dx_current_tag(); - acred.group_info = get_group_info(((struct cred *)cred)->group_info); - ++ acred.tag = make_ktag(&init_user_ns, dx_current_tag()); + acred.group_info = cred->group_info; ret = auth->au_ops->lookup_cred(auth, &acred, flags); -@@ -521,6 +523,7 @@ rpcauth_bind_root_cred(struct rpc_task * + return ret; +@@ -669,6 +671,7 @@ rpcauth_bind_root_cred(struct rpc_task * struct auth_cred acred = { - .uid = 0, - .gid = 0, -+ .tag = dx_current_tag(), + .uid = GLOBAL_ROOT_UID, + .gid = GLOBAL_ROOT_GID, ++ .tag = KTAGT_INIT(dx_current_tag()), }; dprintk("RPC: %5u looking up %s cred\n", -diff -NurpP --minimal linux-3.7/net/sunrpc/auth_unix.c linux-3.7-vs2.3.5.1/net/sunrpc/auth_unix.c ---- linux-3.7/net/sunrpc/auth_unix.c 2012-07-22 21:39:49.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/sunrpc/auth_unix.c 2012-12-11 15:56:33.000000000 +0000 +diff -urNp -x '*.orig' linux-4.9/net/sunrpc/auth_unix.c linux-4.9/net/sunrpc/auth_unix.c +--- linux-4.9/net/sunrpc/auth_unix.c 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/net/sunrpc/auth_unix.c 2021-02-24 15:47:45.144411223 +0100 @@ -13,11 +13,13 @@ #include #include @@ -25699,26 +24726,26 @@ diff -NurpP --minimal linux-3.7/net/sunrpc/auth_unix.c linux-3.7-vs2.3.5.1/net/s struct unx_cred { struct rpc_cred uc_base; -+ tag_t uc_tag; - gid_t uc_gid; - gid_t uc_gids[NFS_NGROUPS]; ++ ktag_t uc_tag; + kgid_t uc_gid; + kgid_t uc_gids[NFS_NGROUPS]; }; -@@ -79,6 +81,7 @@ unx_create_cred(struct rpc_auth *auth, s +@@ -86,6 +88,7 @@ unx_create_cred(struct rpc_auth *auth, s groups = NFS_NGROUPS; cred->uc_gid = acred->gid; + cred->uc_tag = acred->tag; - for (i = 0; i < groups; i++) { - gid_t gid; - gid = from_kgid(&init_user_ns, GROUP_AT(acred->group_info, i)); -@@ -123,7 +126,9 @@ unx_match(struct auth_cred *acred, struc + for (i = 0; i < groups; i++) + cred->uc_gids[i] = acred->group_info->gid[i]; + if (i < NFS_NGROUPS) +@@ -127,7 +130,9 @@ unx_match(struct auth_cred *acred, struc unsigned int i; -- if (cred->uc_uid != acred->uid || cred->uc_gid != acred->gid) -+ if (cred->uc_uid != acred->uid || -+ cred->uc_gid != acred->gid || -+ cred->uc_tag != acred->tag) +- if (!uid_eq(cred->uc_uid, acred->uid) || !gid_eq(cred->uc_gid, acred->gid)) ++ if (!uid_eq(cred->uc_uid, acred->uid) || ++ !gid_eq(cred->uc_gid, acred->gid) || ++ !tag_eq(cred->uc_tag, acred->tag)) return 0; if (acred->group_info != NULL) @@ -25731,33 +24758,32 @@ diff -NurpP --minimal linux-3.7/net/sunrpc/auth_unix.c linux-3.7-vs2.3.5.1/net/s *p++ = htonl(RPC_AUTH_UNIX); base = p++; -@@ -162,9 +167,12 @@ unx_marshal(struct rpc_task *task, __be3 - * Copy the UTS nodename captured when the client was created. +@@ -163,8 +168,11 @@ unx_marshal(struct rpc_task *task, __be3 */ p = xdr_encode_array(p, clnt->cl_nodename, clnt->cl_nodelen); -+ tag = task->tk_client->cl_tag; -- *p++ = htonl((u32) cred->uc_uid); -- *p++ = htonl((u32) cred->uc_gid); -+ *p++ = htonl((u32) TAGINO_UID(tag, -+ cred->uc_uid, cred->uc_tag)); -+ *p++ = htonl((u32) TAGINO_GID(tag, -+ cred->uc_gid, cred->uc_tag)); +- *p++ = htonl((u32) from_kuid(&init_user_ns, cred->uc_uid)); +- *p++ = htonl((u32) from_kgid(&init_user_ns, cred->uc_gid)); ++ tag = task->tk_client->cl_tag; ++ *p++ = htonl((u32) from_kuid(&init_user_ns, ++ TAGINO_KUID(tag, cred->uc_uid, cred->uc_tag))); ++ *p++ = htonl((u32) from_kgid(&init_user_ns, ++ TAGINO_KGID(tag, cred->uc_gid, cred->uc_tag))); hold = p++; - for (i = 0; i < 16 && cred->uc_gids[i] != (gid_t) NOGROUP; i++) - *p++ = htonl((u32) cred->uc_gids[i]); -diff -NurpP --minimal linux-3.7/net/sunrpc/clnt.c linux-3.7-vs2.3.5.1/net/sunrpc/clnt.c ---- linux-3.7/net/sunrpc/clnt.c 2012-12-11 15:47:57.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/sunrpc/clnt.c 2012-12-11 15:56:33.000000000 +0000 + for (i = 0; i < 16 && gid_valid(cred->uc_gids[i]); i++) + *p++ = htonl((u32) from_kgid(&init_user_ns, cred->uc_gids[i])); +diff -urNp -x '*.orig' linux-4.9/net/sunrpc/clnt.c linux-4.9/net/sunrpc/clnt.c +--- linux-4.9/net/sunrpc/clnt.c 2021-02-24 15:47:32.684021415 +0100 ++++ linux-4.9/net/sunrpc/clnt.c 2021-02-24 15:47:45.147744660 +0100 @@ -31,6 +31,7 @@ + #include #include #include - #include +#include #include - #include -@@ -481,6 +482,9 @@ struct rpc_clnt *rpc_create(struct rpc_c + #include +@@ -496,6 +497,9 @@ static struct rpc_clnt *rpc_create_xprt( if (!(args->flags & RPC_CLNT_CREATE_QUIET)) clnt->cl_chatty = 1; @@ -25766,20 +24792,20 @@ diff -NurpP --minimal linux-3.7/net/sunrpc/clnt.c linux-3.7-vs2.3.5.1/net/sunrpc + clnt->cl_tag = 1; */ return clnt; } - EXPORT_SYMBOL_GPL(rpc_create); -diff -NurpP --minimal linux-3.7/net/unix/af_unix.c linux-3.7-vs2.3.5.1/net/unix/af_unix.c ---- linux-3.7/net/unix/af_unix.c 2012-12-11 15:47:57.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/net/unix/af_unix.c 2012-12-11 15:56:33.000000000 +0000 -@@ -114,6 +114,8 @@ - #include + +diff -urNp -x '*.orig' linux-4.9/net/unix/af_unix.c linux-4.9/net/unix/af_unix.c +--- linux-4.9/net/unix/af_unix.c 2021-02-24 15:47:32.694021728 +0100 ++++ linux-4.9/net/unix/af_unix.c 2021-02-24 15:47:45.147744660 +0100 +@@ -117,6 +117,8 @@ #include #include + #include +#include +#include struct hlist_head unix_socket_table[2 * UNIX_HASH_SIZE]; EXPORT_SYMBOL_GPL(unix_socket_table); -@@ -271,6 +273,8 @@ static struct sock *__unix_find_socket_b +@@ -290,6 +292,8 @@ static struct sock *__unix_find_socket_b if (!net_eq(sock_net(s), net)) continue; @@ -25788,7 +24814,7 @@ diff -NurpP --minimal linux-3.7/net/unix/af_unix.c linux-3.7-vs2.3.5.1/net/unix/ if (u->addr->len == len && !memcmp(u->addr->name, sunname, len)) goto found; -@@ -2259,6 +2263,8 @@ static struct sock *unix_from_bucket(str +@@ -2751,6 +2755,8 @@ static struct sock *unix_from_bucket(str for (sk = sk_head(&unix_socket_table[bucket]); sk; sk = sk_next(sk)) { if (sock_net(sk) != seq_file_net(seq)) continue; @@ -25797,7 +24823,7 @@ diff -NurpP --minimal linux-3.7/net/unix/af_unix.c linux-3.7-vs2.3.5.1/net/unix/ if (++count == offset) break; } -@@ -2276,6 +2282,8 @@ static struct sock *unix_next_socket(str +@@ -2768,6 +2774,8 @@ static struct sock *unix_next_socket(str sk = sk_next(sk); if (!sk) goto next_bucket; @@ -25806,10 +24832,30 @@ diff -NurpP --minimal linux-3.7/net/unix/af_unix.c linux-3.7-vs2.3.5.1/net/unix/ if (sock_net(sk) == seq_file_net(seq)) return sk; } -diff -NurpP --minimal linux-3.7/scripts/checksyscalls.sh linux-3.7-vs2.3.5.1/scripts/checksyscalls.sh ---- linux-3.7/scripts/checksyscalls.sh 2012-10-04 13:27:51.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/scripts/checksyscalls.sh 2012-12-11 15:56:33.000000000 +0000 -@@ -193,7 +193,6 @@ cat << EOF +diff -urNp -x '*.orig' linux-4.9/net/unix/diag.c linux-4.9/net/unix/diag.c +--- linux-4.9/net/unix/diag.c 2021-02-24 15:47:32.694021728 +0100 ++++ linux-4.9/net/unix/diag.c 2021-02-24 15:47:45.147744660 +0100 +@@ -4,6 +4,7 @@ + #include + #include + #include ++#include + #include + #include + #include +@@ -200,6 +201,8 @@ static int unix_diag_dump(struct sk_buff + sk_for_each(sk, &unix_socket_table[slot]) { + if (!net_eq(sock_net(sk), net)) + continue; ++ if (!nx_check(sk->sk_nid, VS_WATCH_P | VS_IDENT)) ++ continue; + if (num < s_num) + goto next; + if (!(req->udiag_states & (1 << sk->sk_state))) +diff -urNp -x '*.orig' linux-4.9/scripts/checksyscalls.sh linux-4.9/scripts/checksyscalls.sh +--- linux-4.9/scripts/checksyscalls.sh 2016-12-11 20:17:54.000000000 +0100 ++++ linux-4.9/scripts/checksyscalls.sh 2021-02-24 15:47:45.147744660 +0100 +@@ -196,7 +196,6 @@ cat << EOF #define __IGNORE_afs_syscall #define __IGNORE_getpmsg #define __IGNORE_putpmsg @@ -25817,24 +24863,24 @@ diff -NurpP --minimal linux-3.7/scripts/checksyscalls.sh linux-3.7-vs2.3.5.1/scr EOF } -diff -NurpP --minimal linux-3.7/security/commoncap.c linux-3.7-vs2.3.5.1/security/commoncap.c ---- linux-3.7/security/commoncap.c 2012-07-22 21:39:51.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/security/commoncap.c 2012-12-11 15:56:33.000000000 +0000 -@@ -76,14 +76,20 @@ int cap_netlink_send(struct sock *sk, st +diff -urNp -x '*.orig' linux-4.9/security/commoncap.c linux-4.9/security/commoncap.c +--- linux-4.9/security/commoncap.c 2021-02-24 15:47:32.714022353 +0100 ++++ linux-4.9/security/commoncap.c 2021-02-24 15:47:45.147744660 +0100 +@@ -71,6 +71,7 @@ static void warn_setuid_and_fcaps_mixed( int cap_capable(const struct cred *cred, struct user_namespace *targ_ns, int cap, int audit) { + struct vx_info *vxi = current_vx_info(); /* FIXME: get vxi from cred? */ -+ - for (;;) { - /* The owner of the user namespace has all caps. */ - if (targ_ns != &init_user_ns && uid_eq(targ_ns->owner, cred->euid)) - return 0; + struct user_namespace *ns = targ_ns; + /* See if cred has the capability in the target user namespace +@@ -79,8 +80,12 @@ int cap_capable(const struct cred *cred, + */ + for (;;) { /* Do we have the necessary capabilities? */ -- if (targ_ns == cred->user_ns) +- if (ns == cred->user_ns) - return cap_raised(cred->cap_effective, cap) ? 0 : -EPERM; -+ if (targ_ns == cred->user_ns) { ++ if (ns == cred->user_ns) { + if (vx_info_flags(vxi, VXF_STATE_SETUP, 0) && + cap_raised(cred->cap_effective, cap)) + return 0; @@ -25842,8 +24888,8 @@ diff -NurpP --minimal linux-3.7/security/commoncap.c linux-3.7-vs2.3.5.1/securit + } /* Have we tried all of the parent namespaces? */ - if (targ_ns == &init_user_ns) -@@ -619,7 +625,7 @@ int cap_inode_setxattr(struct dentry *de + if (ns == &init_user_ns) +@@ -668,7 +673,7 @@ int cap_inode_setxattr(struct dentry *de if (!strncmp(name, XATTR_SECURITY_PREFIX, sizeof(XATTR_SECURITY_PREFIX) - 1) && @@ -25852,7 +24898,7 @@ diff -NurpP --minimal linux-3.7/security/commoncap.c linux-3.7-vs2.3.5.1/securit return -EPERM; return 0; } -@@ -645,7 +651,7 @@ int cap_inode_removexattr(struct dentry +@@ -694,7 +699,7 @@ int cap_inode_removexattr(struct dentry if (!strncmp(name, XATTR_SECURITY_PREFIX, sizeof(XATTR_SECURITY_PREFIX) - 1) && @@ -25861,10 +24907,10 @@ diff -NurpP --minimal linux-3.7/security/commoncap.c linux-3.7-vs2.3.5.1/securit return -EPERM; return 0; } -diff -NurpP --minimal linux-3.7/security/selinux/hooks.c linux-3.7-vs2.3.5.1/security/selinux/hooks.c ---- linux-3.7/security/selinux/hooks.c 2012-12-11 15:48:01.000000000 +0000 -+++ linux-3.7-vs2.3.5.1/security/selinux/hooks.c 2012-12-11 15:56:33.000000000 +0000 -@@ -66,7 +66,6 @@ +diff -urNp -x '*.orig' linux-4.9/security/selinux/hooks.c linux-4.9/security/selinux/hooks.c +--- linux-4.9/security/selinux/hooks.c 2021-02-24 15:47:32.720689229 +0100 ++++ linux-4.9/security/selinux/hooks.c 2021-02-24 15:47:45.147744660 +0100 +@@ -67,7 +67,6 @@ #include #include #include /* for Unix socket types */ @@ -25872,285 +24918,3 @@ diff -NurpP --minimal linux-3.7/security/selinux/hooks.c linux-3.7-vs2.3.5.1/sec #include #include #include -diff -NurpP linux-3.7-vs2.3.5.1/kernel/vserver/network.c linux-3.7-vs2.3.5.1.1/kernel/vserver/network.c ---- linux-3.7-vs2.3.5.1/kernel/vserver/network.c 2012-12-11 15:56:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.1/kernel/vserver/network.c 2012-12-13 13:48:35.000000000 +0000 -@@ -162,6 +163,9 @@ static void __dealloc_nx_info(struct nx_ - BUG_ON(atomic_read(&nxi->nx_tasks)); - - __dealloc_nx_addr_v4_all(nxi->v4.next); -+#ifdef CONFIG_IPV6 -+ __dealloc_nx_addr_v6_all(nxi->v6.next); -+#endif - - nxi->nx_state |= NXS_RELEASED; - kfree(nxi); -diff -NurpP linux-3.7-vs2.3.5.1/include/linux/vs_inet.h linux-3.7-vs2.3.5.1.1/include/linux/vs_inet.h ---- linux-3.7-vs2.3.5.1/include/linux/vs_inet.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.1/include/linux/vs_inet.h 2012-12-13 12:52:33.000000000 +0000 -@@ -81,12 +81,15 @@ int v4_addr_in_nx_info(struct nx_info *n - (nxi->v4_bcast.s_addr == addr)) - goto out; - ret = 5; -+ - /* check for v4 addresses */ -+ spin_lock(&nxi->addr_lock); - for (nxa = &nxi->v4; nxa; nxa = nxa->next) - if (v4_addr_match(nxa, addr, tmask)) - goto out; - ret = 0; - out: -+ spin_unlock(&nxi->addr_lock); - vxdprintk(VXD_CBIT(net, 0), - "v4_addr_in_nx_info(%p[#%u]," NIPQUAD_FMT ",%04x) = %d", - nxi, nxi ? nxi->nx_id : 0, NIPQUAD(addr), tmask, ret); -@@ -104,11 +107,16 @@ static inline - int v4_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v4 *nxa, uint16_t mask) - { - struct nx_addr_v4 *ptr; -+ int ret = 1; - -+ spin_lock(&nxi->addr_lock); - for (ptr = &nxi->v4; ptr; ptr = ptr->next) - if (v4_nx_addr_match(ptr, nxa, mask)) -- return 1; -- return 0; -+ goto out; -+ ret = 0; -+out: -+ spin_unlock(&nxi->addr_lock); -+ return ret; - } - - #include -diff -NurpP linux-3.7-vs2.3.5.1/include/linux/vs_inet6.h linux-3.7-vs2.3.5.1.1/include/linux/vs_inet6.h ---- linux-3.7-vs2.3.5.1/include/linux/vs_inet6.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.1/include/linux/vs_inet6.h 2012-12-13 12:52:39.000000000 +0000 -@@ -45,11 +45,14 @@ int v6_addr_in_nx_info(struct nx_info *n - - if (!nxi) - goto out; -+ -+ spin_lock(&nxi->addr_lock); - for (nxa = &nxi->v6; nxa; nxa = nxa->next) - if (v6_addr_match(nxa, addr, mask)) - goto out; - ret = 0; - out: -+ spin_unlock(&nxi->addr_lock); - vxdprintk(VXD_CBIT(net, 0), - "v6_addr_in_nx_info(%p[#%u],%pI6,%04x) = %d", - nxi, nxi ? nxi->nx_id : 0, addr, mask, ret); -@@ -67,11 +70,16 @@ static inline - int v6_nx_addr_in_nx_info(struct nx_info *nxi, struct nx_addr_v6 *nxa, uint16_t mask) - { - struct nx_addr_v6 *ptr; -+ int ret = 1; - -+ spin_lock(&nxi->addr_lock); - for (ptr = &nxi->v6; ptr; ptr = ptr->next) - if (v6_nx_addr_match(ptr, nxa, mask)) -- return 1; -- return 0; -+ goto out; -+ ret = 0; -+out: -+ spin_unlock(&nxi->addr_lock); -+ return ret; - } - - -diff -NurpP linux-3.7-vs2.3.5.1/include/linux/vserver/network.h linux-3.7-vs2.3.5.1.1/include/linux/vserver/network.h ---- linux-3.7-vs2.3.5.1/include/linux/vserver/network.h 2012-12-11 15:56:32.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.1/include/linux/vserver/network.h 2012-12-13 13:40:52.000000000 +0000 -@@ -109,6 +109,7 @@ struct nx_info { - uint64_t nx_flags; /* network flag word */ - uint64_t nx_ncaps; /* network capabilities */ - -+ spinlock_t addr_lock; /* protect address changes */ - struct in_addr v4_lback; /* Loopback address */ - struct in_addr v4_bcast; /* Broadcast address */ - struct nx_addr_v4 v4; /* First/Single ipv4 address */ -diff -NurpP linux-3.7-vs2.3.5.1/kernel/vserver/network.c linux-3.7-vs2.3.5.1.1/kernel/vserver/network.c ---- linux-3.7-vs2.3.5.1/kernel/vserver/network.c 2012-12-11 15:56:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.1/kernel/vserver/network.c 2012-12-13 13:48:35.000000000 +0000 -@@ -131,6 +131,7 @@ static struct nx_info *__alloc_nx_info(n - INIT_HLIST_NODE(&new->nx_hlist); - atomic_set(&new->nx_usecnt, 0); - atomic_set(&new->nx_tasks, 0); -+ spin_lock_init(&new->addr_lock); - new->nx_state = 0; - - new->nx_flags = NXF_INIT_SET; -@@ -593,26 +597,31 @@ int do_add_v4_addr(struct nx_info *nxi, - uint16_t type, uint16_t flags) - { - struct nx_addr_v4 *nxa = &nxi->v4; -+ struct nx_addr_v4 *new = __alloc_nx_addr_v4(); -+ -+ if (IS_ERR(new)) -+ return PTR_ERR(new); - -+ spin_lock(&nxi->addr_lock); - if (NX_IPV4(nxi)) { - /* locate last entry */ - for (; nxa->next; nxa = nxa->next); -- nxa->next = __alloc_nx_addr_v4(); -- nxa = nxa->next; -- -- if (IS_ERR(nxa)) -- return PTR_ERR(nxa); -- } -+ nxa->next = new; -+ nxa = new; -+ new = NULL; - -- if (nxi->v4.next) - /* remove single ip for ip list */ - nxi->nx_flags &= ~NXF_SINGLE_IP; -+ } - - nxa->ip[0].s_addr = ip; - nxa->ip[1].s_addr = ip2; - nxa->mask.s_addr = mask; - nxa->type = type; - nxa->flags = flags; -+ spin_unlock(&nxi->addr_lock); -+ if (new) -+ __dealloc_nx_addr_v4(new); - return 0; - } - -@@ -620,20 +629,25 @@ int do_remove_v4_addr(struct nx_info *nx - uint16_t type, uint16_t flags) - { - struct nx_addr_v4 *nxa = &nxi->v4; -+ struct nx_addr_v4 *old = NULL; -+ int ret = 0; - -+ spin_lock(&nxi->addr_lock); - switch (type) { - /* case NXA_TYPE_ADDR: - break; */ - - case NXA_TYPE_ANY: -- __dealloc_nx_addr_v4_all(xchg(&nxa->next, NULL)); -+ old = xchg(&nxa->next, NULL); - memset(nxa, 0, sizeof(*nxa)); - break; - - default: -- return -EINVAL; -+ ret = -EINVAL; - } -- return 0; -+ spin_unlock(&nxi->addr_lock); -+ __dealloc_nx_addr_v4_all(old); -+ return ret; - } - - -@@ -687,10 +701,7 @@ int vc_net_remove(struct nx_info *nxi, v - - switch (vc_data.type) { - case NXA_TYPE_ANY: -- __dealloc_nx_addr_v4_all(xchg(&nxi->v4.next, NULL)); -- memset(&nxi->v4, 0, sizeof(nxi->v4)); -- break; -- -+ return do_remove_v4_addr(nxi, 0, 0, 0, vc_data.type, 0); - default: - return -EINVAL; - } -@@ -782,15 +793,18 @@ int do_add_v6_addr(struct nx_info *nxi, - uint32_t prefix, uint16_t type, uint16_t flags) - { - struct nx_addr_v6 *nxa = &nxi->v6; -+ struct nx_addr_v6 *new = __alloc_nx_addr_v6(); - -+ if (IS_ERR(new)) -+ return PTR_ERR(new); -+ -+ spin_lock(&nxi->addr_lock); - if (NX_IPV6(nxi)) { - /* locate last entry */ - for (; nxa->next; nxa = nxa->next); -- nxa->next = __alloc_nx_addr_v6(); -- nxa = nxa->next; -- -- if (IS_ERR(nxa)) -- return PTR_ERR(nxa); -+ nxa->next = new; -+ nxa = new; -+ new = NULL; - } - - nxa->ip = *ip; -@@ -798,6 +812,9 @@ int do_add_v6_addr(struct nx_info *nxi, - nxa->prefix = prefix; - nxa->type = type; - nxa->flags = flags; -+ spin_unlock(&nxi->addr_lock); -+ if (new) -+ __dealloc_nx_addr_v6(new); - return 0; - } - -diff -NurpP linux-3.7-vs2.3.5.1/kernel/vserver/network.c linux-3.7-vs2.3.5.1.1/kernel/vserver/network.c ---- linux-3.7-vs2.3.5.1/kernel/vserver/network.c 2012-12-11 15:56:33.000000000 +0000 -+++ linux-3.7-vs2.3.5.1.1/kernel/vserver/network.c 2012-12-13 13:48:35.000000000 +0000 -@@ -804,6 +818,31 @@ int do_add_v6_addr(struct nx_info *nxi, - return 0; - } - -+int do_remove_v6_addr(struct nx_info *nxi, -+ struct in6_addr *ip, struct in6_addr *mask, -+ uint32_t prefix, uint16_t type, uint16_t flags) -+{ -+ struct nx_addr_v6 *nxa = &nxi->v6; -+ struct nx_addr_v6 *old = NULL; -+ int ret = 0; -+ -+ spin_lock(&nxi->addr_lock); -+ switch (type) { -+/* case NXA_TYPE_ADDR: -+ break; */ -+ -+ case NXA_TYPE_ANY: -+ old = xchg(&nxa->next, NULL); -+ memset(nxa, 0, sizeof(*nxa)); -+ break; -+ -+ default: -+ ret = -EINVAL; -+ } -+ spin_unlock(&nxi->addr_lock); -+ __dealloc_nx_addr_v6_all(old); -+ return ret; -+} - - int vc_net_add_ipv6(struct nx_info *nxi, void __user *data) - { -@@ -831,10 +873,8 @@ int vc_net_remove_ipv6(struct nx_info *n - - switch (vc_data.type) { - case NXA_TYPE_ANY: -- __dealloc_nx_addr_v6_all(xchg(&nxi->v6.next, NULL)); -- memset(&nxi->v6, 0, sizeof(nxi->v6)); -+ do_remove_v6_addr(nxi, NULL, NULL, 0, vc_data.type, 0); - break; -- - default: - return -EINVAL; - } ---- linux-3.7/net/ipv6/netfilter/ip6t_MASQUERADE.c~ 2012-12-11 04:30:57.000000000 +0100 -+++ linux-3.7/net/ipv6/netfilter/ip6t_MASQUERADE.c 2012-12-13 21:09:30.741602424 +0100 -@@ -34,7 +34,7 @@ - ctinfo == IP_CT_RELATED_REPLY)); - - if (ipv6_dev_get_saddr(dev_net(par->out), par->out, -- &ipv6_hdr(skb)->daddr, 0, &src) < 0) -+ &ipv6_hdr(skb)->daddr, 0, &src, NULL) < 0) - return NF_DROP; - - nfct_nat(ct)->masq_index = par->out->ifindex;