Subject: [folded-merged] ipc-semc-avoid-overflow-of-semop-undo-semadj-value-fix.patch removed from -mm tree
To: akpm@xxxxxxxxxxxxxxxxxxxx,davidlohr@xxxxxx,jkosina@xxxxxxx,manfred@xxxxxxxxxxxxxxxx,pmladek@xxxxxxx,mm-commits@xxxxxxxxxxxxxxx
From: akpm@xxxxxxxxxxxxxxxxxxxx
Date: Mon, 27 Jan 2014 16:55:24 -0800
The patch titled
Subject: ipc-semc-avoid-overflow-of-semop-undo-semadj-value-fix
has been removed from the -mm tree. Its filename was
ipc-semc-avoid-overflow-of-semop-undo-semadj-value-fix.patch
This patch was dropped because it was folded into ipc-semc-avoid-overflow-of-semop-undo-semadj-value.patch
------------------------------------------------------
From: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
Subject: ipc-semc-avoid-overflow-of-semop-undo-semadj-value-fix
restore lessened scope of local `undo'
Cc: Davidlohr Bueso <davidlohr@xxxxxx>
Cc: Jiri Kosina <jkosina@xxxxxxx>
Cc: Manfred Spraul <manfred@xxxxxxxxxxxxxxxx>
Cc: Petr Mladek <pmladek@xxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
ipc/sem.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff -puN ipc/sem.c~ipc-semc-avoid-overflow-of-semop-undo-semadj-value-fix ipc/sem.c
--- a/ipc/sem.c~ipc-semc-avoid-overflow-of-semop-undo-semadj-value-fix
+++ a/ipc/sem.c
@@ -599,7 +599,7 @@ SYSCALL_DEFINE3(semget, key_t, key, int,
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 s
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;
_
Patches currently in -mm which might be from akpm@xxxxxxxxxxxxxxxxxxxx are
origin.patch
arch-unicore32-kernel-early_printkc-setup_early_printk-missing-initialization.patch
ipc-semc-avoid-overflow-of-semop-undo-semadj-value.patch
ipcmsg-document-barriers-fix.patch
ipcmsg-document-barriers-fix-fix.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
