summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTimo Warns <Warns@pre-sense.de>2011-05-19 09:24:17 +0200
committerLinus Torvalds <torvalds@linux-foundation.org>2011-05-20 16:40:36 -0700
commitcae13fe4cc3f24820ffb990c09110626837e85d4 (patch)
treedb3722f6c3ffc142eb3b931fb41b34d8dab3eaa7
parente6c9366b2adb52cba64b359b3050200743c7568c (diff)
downloadop-kernel-dev-cae13fe4cc3f24820ffb990c09110626837e85d4.zip
op-kernel-dev-cae13fe4cc3f24820ffb990c09110626837e85d4.tar.gz
Fix for buffer overflow in ldm_frag_add not sufficient
As Ben Hutchings discovered [1], the patch for CVE-2011-1017 (buffer overflow in ldm_frag_add) is not sufficient. The original patch in commit c340b1d64000 ("fs/partitions/ldm.c: fix oops caused by corrupted partition table") does not consider that, for subsequent fragments, previously allocated memory is used. [1] http://lkml.org/lkml/2011/5/6/407 Reported-by: Ben Hutchings <ben@decadent.org.uk> Signed-off-by: Timo Warns <warns@pre-sense.de> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
-rw-r--r--fs/partitions/ldm.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/partitions/ldm.c b/fs/partitions/ldm.c
index ce4f624..a29d5cc 100644
--- a/fs/partitions/ldm.c
+++ b/fs/partitions/ldm.c
@@ -1335,6 +1335,11 @@ static bool ldm_frag_add (const u8 *data, int size, struct list_head *frags)
list_add_tail (&f->list, frags);
found:
+ if (rec >= f->num) {
+ ldm_error("REC value (%d) exceeds NUM value (%d)", rec, f->num);
+ return false;
+ }
+
if (f->map & (1 << rec)) {
ldm_error ("Duplicate VBLK, part %d.", rec);
f->map &= 0x7F; /* Mark the group as broken */
OpenPOWER on IntegriCloud