From 0687453e6eb8d839a01d369665d9241687dee3a2 Mon Sep 17 00:00:00 2001
From: Andrew Morton <akpm@linux-foundation.org>
Date: Fri, 3 Jan 2014 14:10:37 +1100
Subject: [PATCH] ipc-semc-avoid-overflow-of-semop-undo-semadj-value-fix

restore lessened scope of local `undo'

Cc: Davidlohr Bueso <davidlohr@hp.com>
Cc: Jiri Kosina <jkosina@suse.cz>
Cc: Manfred Spraul <manfred@colorfullife.com>
Cc: Petr Mladek <pmladek@suse.cz>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
---
 ipc/sem.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ipc/sem.c b/ipc/sem.c
index 0d4375761449..1f98f678ead3 100644
--- a/ipc/sem.c
+++ b/ipc/sem.c
@@ -599,7 +599,7 @@ SYSCALL_DEFINE3(semget, key_t, key, int, nsems, int, semflg)
 static int perform_atomic_semop(struct sem_array *sma, struct sembuf *sops,
 			     int nsops, struct sem_undo *un, int pid)
 {
-	int result, undo, sem_op;
+	int result, sem_op;
 	struct sembuf *sop;
 	struct sem * curr;
 
@@ -618,7 +618,7 @@ static int perform_atomic_semop(struct sem_array *sma, struct sembuf *sops,
 			goto out_of_range;
 
 		if (sop->sem_flg & SEM_UNDO) {
-			undo = un->semadj[sop->sem_num] - sem_op;
+			int undo = un->semadj[sop->sem_num] - sem_op;
 			/* Exceeding the undo range is an error. */
 			if (undo < (-SEMAEM - 1) || undo > SEMAEM)
 				goto out_of_range;
-- 
2.39.5