[linux] 02/02: Rebase openvz and vserver patches; resolve conflicts
debian-kernel at lists.debian.org
debian-kernel at lists.debian.org
Thu Oct 8 01:26:49 UTC 2015
This is an automated email from the git hooks/post-receive script.
benh pushed a commit to branch squeeze-security
in repository linux.
commit 238012fd10a18df64a8e249bf501ec3532fa2896
Author: Ben Hutchings <ben at decadent.org.uk>
Date: Thu Oct 8 02:26:09 2015 +0100
Rebase openvz and vserver patches; resolve conflicts
---
debian/patches/features/all/openvz/openvz.patch | 39 ++++++++++++++--------
.../features/all/vserver/vs2.3.0.36.29.8.patch | 7 ++--
.../{48squeeze14-extra => 48squeeze15-extra} | 0
3 files changed, 30 insertions(+), 16 deletions(-)
diff --git a/debian/patches/features/all/openvz/openvz.patch b/debian/patches/features/all/openvz/openvz.patch
index c479be8..a432a5b 100644
--- a/debian/patches/features/all/openvz/openvz.patch
+++ b/debian/patches/features/all/openvz/openvz.patch
@@ -6554,6 +6554,9 @@ Date: Mon Feb 15 15:17:35 2010 +0300
[bwh: Fix context for changes to ret_from_fork, tcp_send_fin() and tcp_connect()
in 2.6.32.66]
[bwh: Fix context for changes to __ptrace_may_access() in 2.6.32.68]
+[bwh: Fix context for changes in ipc/* for fixes for CVE-2015-7613]
+[bwh: Fix context for changes in fs/dcache.c for fix for CVE-2015-2925.
+ Add check for buffer == NULL before the added prepend_path().]
--- /dev/null
+++ b/COPYING.Parallels
@@ -15946,7 +15949,7 @@ Date: Mon Feb 15 15:17:35 2010 +0300
@@ -1911,18 +1997,21 @@ char *__d_path(const struct path *path,
struct vfsmount *vfsmnt = path->mnt;
char *end = buffer + buflen;
- char *retval;
+ char *retval, *tail;
+ int deleted;
+ struct vfsmount *oldmnt = vfsmnt;
@@ -15968,9 +15971,19 @@ Date: Mon Feb 15 15:17:35 2010 +0300
- *retval = '/';
+ if (buffer)
+ *retval = '/';
+ tail = end;
for (;;) {
- struct dentry * parent;
+@@ -1935,7 +2024,8 @@
+ if (dentry != vfsmnt->mnt_root) {
+ buflen += (tail - end);
+ end = tail;
+- prepend(&end, &buflen, "(unreachable)/", 14);
++ if (buffer)
++ prepend(&end, &buflen, "(unreachable)/", 14);
+ retval = end;
+ goto out;
+ }
@@ -1940,20 +2029,43 @@ char *__d_path(const struct path *path,
}
parent = dentry->d_parent;
@@ -38936,9 +38949,9 @@ Date: Mon Feb 15 15:17:35 2010 +0300
if (!nsems)
return -EINVAL;
-@@ -264,7 +267,7 @@ static int newary(struct ipc_namespace *
- return retval;
- }
+@@ -270,7 +274,7 @@ static int newary(struct ipc_namespace *
+ sma->sem_nsems = nsems;
+ sma->sem_ctime = get_seconds();
- id = ipc_addid(&sem_ids(ns), &sma->sem_perm, ns->sc_semmni);
+ id = ipc_addid(&sem_ids(ns), &sma->sem_perm, ns->sc_semmni, semid);
@@ -39134,9 +39147,9 @@ Date: Mon Feb 15 15:17:35 2010 +0300
if (shmflg & SHM_HUGETLB) {
/* hugetlb_file_setup applies strict accounting */
if (shmflg & SHM_NORESERVE)
-@@ -386,7 +364,7 @@ static int newseg(struct ipc_namespace *
- if (IS_ERR(file))
- goto no_file;
+@@ -394,7 +372,7 @@ static int newseg(struct ipc_namespace *
+ shp->shm_nattch = 0;
+ shp->shm_file = file;
- id = ipc_addid(&shm_ids(ns), &shp->shm_perm, ns->shm_ctlmni);
+ id = ipc_addid(&shm_ids(ns), &shp->shm_perm, ns->shm_ctlmni, shmid);
@@ -39247,9 +39260,9 @@ Date: Mon Feb 15 15:17:35 2010 +0300
{
uid_t euid;
gid_t egid;
-@@ -264,7 +267,16 @@ int ipc_addid(struct ipc_ids* ids, struc
- rcu_read_lock();
- spin_lock(&new->lock);
+@@ -268,7 +271,16 @@ int ipc_addid(struct ipc_ids* ids, struc
+ new->cuid = new->uid = euid;
+ new->gid = new->cgid = egid;
- err = idr_get_new(&ids->ipcs_idr, new, &id);
+ if (reqid >= 0) {
@@ -39266,8 +39279,8 @@ Date: Mon Feb 15 15:17:35 2010 +0300
spin_unlock(&new->lock);
rcu_read_unlock();
@@ -277,9 +289,13 @@ int ipc_addid(struct ipc_ids* ids, struc
- new->cuid = new->uid = euid;
- new->gid = new->cgid = egid;
+
+ ids->in_use++;
- new->seq = ids->seq++;
- if(ids->seq > ids->seq_max)
diff --git a/debian/patches/features/all/vserver/vs2.3.0.36.29.8.patch b/debian/patches/features/all/vserver/vs2.3.0.36.29.8.patch
index 3a0508f..52a5542 100644
--- a/debian/patches/features/all/vserver/vs2.3.0.36.29.8.patch
+++ b/debian/patches/features/all/vserver/vs2.3.0.36.29.8.patch
@@ -6,6 +6,7 @@
[ijc: Adjust context in net/ipv4/udp.c:udp_recvmsg changed by CVE-2013-6405-1
'inet: prevent leakage of uninitialized memory to user in recv syscalls']
[bwh: Fix context for changes to do_anonymous_page() in 2.6.32.68]
+[bwh: Fix context for changes in ipc/sem.c for fixes for CVE-2015-7613]
--- a/Documentation/scheduler/sched-cfs-hard-limits.txt 1970-01-01 01:00:00.000000000 +0100
+++ a/Documentation/scheduler/sched-cfs-hard-limits.txt 2011-06-10 13:03:02.000000000 +0200
@@ -14703,7 +14704,7 @@
sma->sem_perm.security = NULL;
retval = security_sem_alloc(sma);
-@@ -271,6 +274,9 @@ static int newary(struct ipc_namespace *
+@@ -277,6 +280,9 @@ static int newary(struct ipc_namespace *
return id;
}
ns->used_sems += nsems;
@@ -14711,8 +14712,8 @@
+ vx_semary_inc(sma);
+ vx_nsems_add(sma, nsems);
- sma->sem_base = (struct sem *) &sma[1];
- INIT_LIST_HEAD(&sma->sem_pending);
+ sem_unlock(sma);
+
@@ -547,6 +553,9 @@ static void freeary(struct ipc_namespace
sem_unlock(sma);
diff --git a/debian/patches/series/48squeeze14-extra b/debian/patches/series/48squeeze15-extra
similarity index 100%
rename from debian/patches/series/48squeeze14-extra
rename to debian/patches/series/48squeeze15-extra
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git
More information about the Kernel-svn-changes
mailing list