Package: kernel-patch-openvz
Version: 028.18.1etch4
Severity: grave
Tags: patch
The security updates present in 2.6.18.dfsg.1-13etch3 conflict with two
hunks of the openvz patch.
The attached patch is sufficient to make it apply, athough the line
numbers could use some adjustment..
-- System Information:
Debian Release: 4.0
APT prefers stable
APT policy: (500, 'stable'), (1, 'experimental')
Architecture: i386 (i686)
Shell: /bin/sh linked to /bin/bash
Kernel: Linux 2.6.18-5-686
Locale: LANG=pl_PL.UTF-8, LC_CTYPE=pl_PL.UTF-8 (charmap=UTF-8)
Versions of packages kernel-patch-openvz depends on:
ii bash 3.1dfsg-8 The GNU Bourne Again SHell
ii grep-dctrl 2.9.3 Grep Debian package information -
ii patch 2.5.9-4 Apply a diff file to an original
kernel-patch-openvz recommends no packages.
-- no debconf information
--- diff-ovz-028.18-deb 2007-09-28 22:23:16.000000000 +0100
+++ ovz-028.18-deb.patch 2007-09-28 22:22:48.000000000 +0100
@@ -46105,15 +46105,15 @@
diff -uprN linux-source-2.6.18/fs/jffs2/acl.h linux-source-2.6.18-ovz/fs/jffs2/acl.h
--- linux-source-2.6.18/fs/jffs2/acl.h 2006-09-20 07:42:06.000000000 +0400
+++ linux-source-2.6.18-ovz/fs/jffs2/acl.h 2007-03-09 17:52:50.000000000 +0300
-@@ -27,7 +27,8 @@ struct jffs2_acl_header {
-
+@@ -28,7 +28,8 @@
#define JFFS2_ACL_NOT_CACHED ((void *)-1)
+ extern struct posix_acl *jffs2_get_acl(struct inode *inode, int type);
-extern int jffs2_permission(struct inode *, int, struct nameidata *);
+extern int jffs2_permission(struct inode *, int, struct nameidata *,
+ struct exec_perm *perm);
extern int jffs2_acl_chmod(struct inode *);
- extern int jffs2_init_acl(struct inode *, struct inode *);
+ extern int jffs2_init_acl(struct inode *, struct posix_acl *);
extern void jffs2_clear_acl(struct jffs2_inode_info *);
diff -uprN linux-source-2.6.18/fs/jfs/acl.c linux-source-2.6.18-ovz/fs/jfs/acl.c
--- linux-source-2.6.18/fs/jfs/acl.c 2006-09-20 07:42:06.000000000 +0400
@@ -114491,9 +114491,9 @@
if (charged)
vm_unacct_memory(charged);
return error;
-@@ -1492,12 +1518,16 @@ static int acct_stack_growth(struct vm_a
- return -ENOMEM;
- }
+@@ -1525,12 +1525,16 @@
+ if (is_hugepage_only_range(vma->vm_mm, new_start, size))
+ return -EFAULT;
+ if (ub_memory_charge(mm, grow << PAGE_SHIFT, vma->vm_flags,
+ vma->vm_file, UB_SOFT))
@@ -114505,7 +114505,7 @@
*/
if (security_vm_enough_memory(grow))
- return -ENOMEM;
-+ goto fail_sec;
++ goto fail_charge;
/* Ok, everything looks good - let it rip */
mm->total_vm += grow;
