[linux] 01/01: Fix mangled patch to ipc/sem.c

[debian-kernel at lists.debian.org]

This is an automated email from the git hooks/post-receive script.

benh pushed a commit to branch wheezy-security
in repository linux.

commit 12a054c6e0af7c3f5d83489f14de0fd0fcdb06e9
Author: Ben Hutchings <ben at decadent.org.uk>
Date:   Mon Oct 5 00:28:04 2015 +0100

    Fix mangled patch to ipc/sem.c
---
 .../all/ipc-sem.c-fully-initialize-sem_array-before-making-i.patch  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/patches/bugfix/all/ipc-sem.c-fully-initialize-sem_array-before-making-i.patch b/debian/patches/bugfix/all/ipc-sem.c-fully-initialize-sem_array-before-making-i.patch
index 51f2d39..cfef9fb 100644
--- a/debian/patches/bugfix/all/ipc-sem.c-fully-initialize-sem_array-before-making-i.patch
+++ b/debian/patches/bugfix/all/ipc-sem.c-fully-initialize-sem_array-before-making-i.patch
@@ -40,9 +40,9 @@ Signed-off-by: Linus Torvalds <torvalds at linux-foundation.org>
  
  	for (i = 0; i < nsems; i++)
 @@ -332,6 +324,15 @@ static int newary(struct ipc_namespace *
- 	INIT_LIST_HEAD(&msq->q_messages);
- 	INIT_LIST_HEAD(&msq->q_receivers);
- 	INIT_LIST_HEAD(&msq->q_senders);
+ 	INIT_LIST_HEAD(&sma->list_id);
+ 	sma->sem_nsems = nsems;
+ 	sma->sem_ctime = get_seconds();
 +
 +	id = ipc_addid(&sem_ids(ns), &sma->sem_perm, ns->sc_semmni);
 +	if (id < 0) {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/kernel/linux.git