1. 29 Apr, 2013 11 commits
    • Andrey Vagin's avatar
      restore: handle errors of setting credentials (v2) · a724acf5
      Andrey Vagin authored
      v2: handle errors from setXids and securebits manipulations
          handle errors of restoring creds after finishing CR_STATE_RESTORE_CREDS,
          because a sigchild handler is already restored in this moment.
          Only the current process is killed in a error case.
      Signed-off-by: 's avatarAndrey Vagin <avagin@openvz.org>
      Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
      a724acf5
    • Andrew Vagin's avatar
      495c8007
    • Andrey Vagin's avatar
      zdtm: check bset in caps00 · 42d861bb
      Andrey Vagin authored
      Signed-off-by: 's avatarAndrey Vagin <avagin@openvz.org>
      Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
      42d861bb
    • Andrey Vagin's avatar
    • Libo Chen's avatar
      cr-check: fix pipe fd leak · 69ca9aff
      Libo Chen authored
      fix fdinfo leak.
      Signed-off-by: 's avatarLibo Chen <libo.chen@huawei.com>
      Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
      69ca9aff
    • Vasily Averin's avatar
      proc_parse: double fclose in parse_fdinfo · 9c88d0cd
      Vasily Averin authored
      "crtools check" crashes on ubuntu 12.10
      (00.011275) Error (proc_parse.c:1049): No records of type 6 found in fdinfo file
      (00.011281) Error (proc_parse.c:1052): parse_fdinfo: error parsing [flags:  02 ] for 6 : Operation not permitted
      *** glibc detected *** /home/vvs/devel/criu/crtools/crtools: double free or corruption (top): 0x000000000068a5a0 **
      Signed-off-by: 's avatarVasily Averin <vvs@parallels.com>
      
      diff-double-fclose-in-parse_fdinfo
      Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
      9c88d0cd
    • Libo Chen's avatar
      sk-netlink: fix overflow · e3101c8e
      Libo Chen authored
      break running./crtools check :
      
      *** buffer overflow detected ***: ./crtools terminated
      ======= Backtrace: =========
      /lib/x86_64-linux-gnu/libc.so.6(__fortify_fail+0x5c)[0x7fdaacb3e82c]
      /lib/x86_64-linux-gnu/libc.so.6(+0x109700)[0x7fdaacb3d700]
      ./crtools[0x423d00]
      ./crtools[0x41d021]
      ./crtools[0x41d259]
      ./crtools[0x41e4b6]
      ./crtools[0x418f03]
      ./crtools[0x404988]
      /lib/x86_64-linux-gnu/libc.so.6(__libc_start_main+0xed)[0x7fdaaca5576d]
      ./crtools[0x404ad9]
      ======= Memory map: ========
      00400000-00463000 r-xp 00000000 08:01 189158                             /home/clb/crtools/crtools
      00662000-00663000 r--p 00062000 08:01 189158                             /home/clb/crtools/crtools
      00663000-00671000 rw-p 00063000 08:01 189158                             /home/clb/crtools/crtools
      00671000-00677000 rw-p 00000000 00:00 0
      01801000-01822000 rw-p 00000000 00:00 0                                  [heap]
      7fdaac81e000-7fdaac833000 r-xp 00000000 08:01 410533                     /lib/x86_64-linux-gnu/libgcc_s.so.1
      7fdaac833000-7fdaaca32000 ---p 00015000 08:01 410533                     /lib/x86_64-linux-gnu/libgcc_s.so.1
      7fdaaca32000-7fdaaca33000 r--p 00014000 08:01 410533                     /lib/x86_64-linux-gnu/libgcc_s.so.1
      7fdaaca33000-7fdaaca34000 rw-p 00015000 08:01 410533                     /lib/x86_64-linux-gnu/libgcc_s.so.1
      7fdaaca34000-7fdaacbe9000 r-xp 00000000 08:01 393459                     /lib/x86_64-linux-gnu/libc-2.15.so
      7fdaacbe9000-7fdaacde8000 ---p 001b5000 08:01 393459                     /lib/x86_64-linux-gnu/libc-2.15.so
      7fdaacde8000-7fdaacdec000 r--p 001b4000 08:01 393459                     /lib/x86_64-linux-gnu/libc-2.15.so
      7fdaacdec000-7fdaacdee000 rw-p 001b8000 08:01 393459                     /lib/x86_64-linux-gnu/libc-2.15.so
      7fdaacdee000-7fdaacdf3000 rw-p 00000000 00:00 0
      7fdaacdf3000-7fdaace03000 r-xp 00000000 08:01 937695                     /usr/local/lib/libprotobuf-c.so.0.0.0
      7fdaace03000-7fdaad002000 ---p 00010000 08:01 937695                     /usr/local/lib/libprotobuf-c.so.0.0.0
      7fdaad002000-7fdaad003000 r--p 0000f000 08:01 937695                     /usr/local/lib/libprotobuf-c.so.0.0.0
      7fdaad003000-7fdaad004000 rw-p 00010000 08:01 937695                     /usr/local/lib/libprotobuf-c.so.0.0.0
      7fdaad004000-7fdaad01c000 r-xp 00000000 08:01 393528                     /lib/x86_64-linux-gnu/libpthread-2.15.so
      7fdaad01c000-7fdaad21b000 ---p 00018000 08:01 393528                     /lib/x86_64-linux-gnu/libpthread-2.15.so
      7fdaad21b000-7fdaad21c000 r--p 00017000 08:01 393528                     /lib/x86_64-linux-gnu/libpthread-2.15.so
      7fdaad21c000-7fdaad21d000 rw-p 00018000 08:01 393528                     /lib/x86_64-linux-gnu/libpthread-2.15.so
      7fdaad21d000-7fdaad221000 rw-p 00000000 00:00 0
      7fdaad221000-7fdaad243000 r-xp 00000000 08:01 393441                     /lib/x86_64-linux-gnu/ld-2.15.so
      7fdaad437000-7fdaad43b000 rw-p 00000000 00:00 0
      7fdaad440000-7fdaad443000 rw-p 00000000 00:00 0
      7fdaad443000-7fdaad444000 r--p 00022000 08:01 393441                     /lib/x86_64-linux-gnu/ld-2.15.so
      7fdaad444000-7fdaad446000 rw-p 00023000 08:01 393441                     /lib/x86_64-linux-gnu/ld-2.15.so
      7fff9eb3c000-7fff9eb5d000 rw-p 00000000 00:00 0                          [stack]
      7fff9ebcf000-7fff9ebd1000 r-xp 00000000 00:00 0                          [vdso]
      ffffffffff600000-ffffffffff601000 r-xp 00000000 00:00 0                  [vsyscall]
      
      I find this overflow by the phase: memcpy(sd->groups, groups, sd->gsize);
      The reason is sd->gsize = 8 Byte, but sd->groups = xmalloc(sizeof(sd->gsize))  is exact 4 Byte.
      Signed-off-by: 's avatarLibo Chen <libo.chen@huawei.com>
      Signed-off-by: 's avatarQiang Huang <h.huangqiang@huawei.com>
      Acked-by: 's avatarAndrey Vagin <avagin@openvz.org>
      Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
      e3101c8e
    • Kir Kolyshkin's avatar
      Makefile: remove --no-print-directory · 2cd78c5d
      Kir Kolyshkin authored
      1 The comment before MAKEFLAGS assignment (see commit 25e8cb5c) talks
      about -r (and possibly -R) flags and has nothing to do with
      --no-print-directory. Let's remove the last option to not confuse
      a reader.
      
      2 The --no-print-directory flag to build and build-crtools shorthands
      is redundant, because scripts/Makefile.build has it already. Remove.
      
      Cc: Cyrill Gorcunov <gorcunov@openvz.org>
      Signed-off-by: 's avatarKir Kolyshkin <kir@openvz.org>
      Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
      2cd78c5d
    • Kir Kolyshkin's avatar
      Makefile: remove unused vars · 4e1be049
      Kir Kolyshkin authored
      We don't use TAGS, AWK or ECHO anywhere in the code (at least according
      to git grep). Let's remove this.
      
      Cc: Cyrill Gorcunov <gorcunov@openvz.org>
      Signed-off-by: 's avatarKir Kolyshkin <kir@openvz.org>
      Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
      4e1be049
    • Kir Kolyshkin's avatar
      Makefile.inc: restore · 97802b0d
      Kir Kolyshkin authored
      This reverts part of commit a519e0c8 which broke the man page build:
      
      	[kir@kirpad Documentation]$ make
      	"  GEN     " crtools.1
      	/bin/sh:   GEN     : command not found
      	make: *** [crtools.1] Error 127
      
      So let's reintroduce Q and E in a separate Makefile.inc as it was
      before.
      
      Cc: Stanislav Kinsbursky <skinsbursky@openvz.org>
      Cc: Cyrill Gorcunov <gorcunov@openvz.org>
      Cc: Pavel Emelyanov <xemul@parallels.com>
      Signed-off-by: 's avatarKir Kolyshkin <kir@openvz.org>
      Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
      97802b0d
    • Libo Chen's avatar
      session03: change CLONE_STACK_SIZE from PAGE_SIZE to 4096 · 6cc5de60
      Libo Chen authored
      Update to patch "check: Introduce --ms option" (commit: 379abca9)
      
      I find this error in my box:
      cc -g -O2 -Wall -Werror -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0 -iquote ../../lib/arch/x86/include -I../../lib   session03.c ../../lib/libzdtmtst.a   -o session03
      session03.c:112:7: error: variably modified ‘stack’ at file scope
      
      The reason is :
      "#define CLONE_STACK_SIZE PAGE_SIZE" is conflict with  "#define PAGE_SIZE  (sysconf(_SC_PAGESIZE))" defined in <sys/user.h>.
      
      I think CLONE_STACK_SIZE should be seted  4096 as session02.c.
      
      If this patch is appropriate, please let me know.
      Signed-off-by: 's avatarLibo Chen <libo.chen@huawei.com>
      Signed-off-by: 's avatarQiang Huang <h.huangqiang@huawei.com>
      Acked-by: 's avatarAndrew Vagin <avagin@parallels.com>
      Signed-off-by: 's avatarPavel Emelyanov <xemul@parallels.com>
      6cc5de60
  2. 23 Apr, 2013 4 commits
  3. 19 Apr, 2013 3 commits
  4. 18 Apr, 2013 3 commits
  5. 16 Apr, 2013 15 commits
  6. 15 Apr, 2013 4 commits