Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Benedikt Boehm (hollow)" <hollow@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-cluster/util-vserver/files: util-vserver-0.30.215-dietmmap.patch util-vserver-0.30.215-2718.patch
Date: Tue, 24 Mar 2009 09:26:06
Message-Id: E1Lm2tY-0007YY-4E@stork.gentoo.org
1 hollow 09/03/24 09:26:04
2
3 Added: util-vserver-0.30.215-dietmmap.patch
4 util-vserver-0.30.215-2718.patch
5 Log:
6 fix mmap problems wrt #228135
7 (Portage version: 2.2_rc25/cvs/Linux i686)
8
9 Revision Changes Path
10 1.1 sys-cluster/util-vserver/files/util-vserver-0.30.215-dietmmap.patch
11
12 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/util-vserver/files/util-vserver-0.30.215-dietmmap.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/util-vserver/files/util-vserver-0.30.215-dietmmap.patch?rev=1.1&content-type=text/plain
14
15 Index: util-vserver-0.30.215-dietmmap.patch
16 ===================================================================
17 diff -Nru util-vserver-0.30.215.orig/Makefile.in util-vserver-0.30.215/Makefile.in
18 --- util-vserver-0.30.215.orig/Makefile.in 2008-03-17 10:00:13.000000000 +0100
19 +++ util-vserver-0.30.215/Makefile.in 2008-06-18 19:24:54.000000000 +0200
20 @@ -1496,7 +1496,7 @@
21 $(lib_internal_testsuite_sigbus_gnu_SOURCES) \
22 $(src_capchroot_SOURCES) $(src_chain_echo_SOURCES) \
23 $(src_chbind_compat_SOURCES) $(src_chcontext_compat_SOURCES) \
24 - src/check-unixfile.c $(src_chroot_sh_SOURCES) \
25 + $(src_chroot_sh_SOURCES) \
26 $(src_chxid_SOURCES) $(src_exec_cd_SOURCES) \
27 $(src_exec_ulimit_SOURCES) $(src_fakerunlevel_SOURCES) \
28 $(src_filetime_SOURCES) $(src_h2ext_SOURCES) \
29 @@ -1818,7 +1818,7 @@
30 ensc_fmt/lib_libvserver_a-% lib/testsuite/cflags \
31 lib/testsuite/personality lib/testsuite/fmt \
32 src/chcontext-compat src/capchroot src/chain-echo \
33 - src/check-unixfile src/chroot-sh src/filetime src/lockfile \
34 + src/chroot-sh src/filetime src/lockfile \
35 src/readlink src/secure-mount src/save_ctxinfo src/mask2prefix \
36 src/chbind-compat src/exec-cd src/fakerunlevel \
37 src/keep-ctx-alive src/exec-ulimit src/vps src/lsxid src/chxid \
38 @@ -1828,7 +1828,7 @@
39 src/vsched src/vshelper-sync src/vrsetup src/vserver-stat \
40 src/vserver-info src/vdlimit src/vdu src/vwait src/ncontext \
41 src/nattribute src/naddress src/vdevmap src/vsysctl src/vclone \
42 - src/h2ext src/vtag src/vspace src/vmemctrl src/tunctl \
43 + src/vtag src/vspace src/vmemctrl src/tunctl \
44 $(am__append_3) $(tests_dietprogs) \
45 lib_internal/libinternal-diet.a \
46 lib_internal/testsuite/isnumber lib_internal/testsuite/sigbus \
47 diff -Nru util-vserver-0.30.215.orig/src/Makefile-files util-vserver-0.30.215/src/Makefile-files
48 --- util-vserver-0.30.215.orig/src/Makefile-files 2008-03-17 09:59:45.000000000 +0100
49 +++ util-vserver-0.30.215/src/Makefile-files 2008-06-18 17:49:42.000000000 +0200
50 @@ -38,7 +38,6 @@
51 DIETPROGS += src/chcontext-compat \
52 src/capchroot \
53 src/chain-echo \
54 - src/check-unixfile \
55 src/chroot-sh \
56 src/filetime \
57 src/lockfile \
58 @@ -81,7 +80,6 @@
59 src/vdevmap \
60 src/vsysctl \
61 src/vclone \
62 - src/h2ext \
63 src/vtag \
64 src/vspace \
65 src/vmemctrl \
66
67
68
69 1.1 sys-cluster/util-vserver/files/util-vserver-0.30.215-2718.patch
70
71 file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/util-vserver/files/util-vserver-0.30.215-2718.patch?rev=1.1&view=markup
72 plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-cluster/util-vserver/files/util-vserver-0.30.215-2718.patch?rev=1.1&content-type=text/plain
73
74 Index: util-vserver-0.30.215-2718.patch
75 ===================================================================
76 diff -Nru util-vserver-0.30.215.orig/lib_internal/unify-copy.c util-vserver-0.30.215/lib_internal/unify-copy.c
77 --- util-vserver-0.30.215.orig/lib_internal/unify-copy.c 2008-03-17 09:59:50.000000000 +0100
78 +++ util-vserver-0.30.215/lib_internal/unify-copy.c 2008-06-17 15:38:50.000000000 +0200
79 @@ -132,8 +132,8 @@
80 buf_size = in_len - offset;
81 if (buf_size > MMAP_BLOCKSIZE) buf_size = MMAP_BLOCKSIZE;
82
83 - if ((in_buf = mmap(0, buf_size, PROT_READ, MAP_SHARED, in_fd, offset))==0 ||
84 - (out_buf = mmap(0, buf_size, PROT_WRITE, MAP_SHARED, out_fd, offset))==0) {
85 + if ((in_buf = mmap(0, buf_size, PROT_READ, MAP_SHARED, in_fd, offset))==MAP_FAILED ||
86 + (out_buf = mmap(0, buf_size, PROT_WRITE, MAP_SHARED, out_fd, offset))==MAP_FAILED) {
87 perror("mmap()");
88 goto out;
89 }
90 diff -Nru util-vserver-0.30.215.orig/src/check-unixfile.c util-vserver-0.30.215/src/check-unixfile.c
91 --- util-vserver-0.30.215.orig/src/check-unixfile.c 2008-03-17 09:59:45.000000000 +0100
92 +++ util-vserver-0.30.215/src/check-unixfile.c 2008-06-17 15:39:11.000000000 +0200
93 @@ -73,7 +73,7 @@
94 }
95 else if (l>0) {
96 data = mmap(0, l, PROT_READ, MAP_PRIVATE, fd, 0);
97 - if (data==0) {
98 + if (data==MAP_FAILED) {
99 perror("mmap()");
100 exit(wrapper_exit_code);
101 }
102 diff -Nru util-vserver-0.30.215.orig/src/h2ext.c util-vserver-0.30.215/src/h2ext.c
103 --- util-vserver-0.30.215.orig/src/h2ext.c 2008-03-17 09:59:45.000000000 +0100
104 +++ util-vserver-0.30.215/src/h2ext.c 2008-06-17 15:39:41.000000000 +0200
105 @@ -148,7 +148,7 @@
106 fd = EopenD(file, O_RDONLY, 0);
107 Efstat(fd, &st);
108 mapping = mmap(NULL, MIN(st.st_size, MAX_PEEK_SIZE), PROT_READ, MAP_SHARED, fd, 0);
109 - if (!mapping) {
110 + if (mapping == MAP_FAILED) {
111 perror("mmap()");
112 Eclose(fd);
113 return -1;
114 diff -Nru util-vserver-0.30.215.orig/src/testsuite/hashcalc-plain.c util-vserver-0.30.215/src/testsuite/hashcalc-plain.c
115 --- util-vserver-0.30.215.orig/src/testsuite/hashcalc-plain.c 2008-03-17 09:59:45.000000000 +0100
116 +++ util-vserver-0.30.215/src/testsuite/hashcalc-plain.c 2008-06-17 15:40:08.000000000 +0200
117 @@ -76,7 +76,7 @@
118 void const * buf;
119 if (buf_size>HASH_BLOCKSIZE) buf_size = HASH_BLOCKSIZE;
120
121 - assert((buf=mmap(0, buf_size, PROT_READ, MAP_SHARED, fd, offset))!=0);
122 + assert((buf=mmap(0, buf_size, PROT_READ, MAP_SHARED, fd, offset))!=MAP_FAILED);
123 offset += buf_size;
124 assert(ensc_crypto_hashctx_update(&hash_context, buf, buf_size)!=-1);
125 munmap((void *)(buf), buf_size);
126 diff -Nru util-vserver-0.30.215.orig/src/vhashify.c util-vserver-0.30.215/src/vhashify.c
127 --- util-vserver-0.30.215.orig/src/vhashify.c 2008-03-17 09:59:45.000000000 +0100
128 +++ util-vserver-0.30.215/src/vhashify.c 2008-06-17 15:40:28.000000000 +0200
129 @@ -332,7 +332,7 @@
130 buf_size = size-offset;
131 if (buf_size>HASH_BLOCKSIZE) buf_size = HASH_BLOCKSIZE;
132
133 - if ((buf=mmap(0, buf_size, PROT_READ, MAP_SHARED, fd, offset))==0) {
134 + if ((buf=mmap(0, buf_size, PROT_READ, MAP_SHARED, fd, offset))==MAP_FAILED) {
135 perror("mmap(<hash>)");
136 goto out;
137 }
Report Message
Find on MARC Find on Google Groups