From 71f0d14c13714baf82c87221111fda2e50b2e974 Mon Sep 17 00:00:00 2001 From: "Volodymyr G. Lukiianyk" Date: Wed, 15 Oct 2008 22:01:15 -0700 Subject: [PATCH] --- yaml --- r: 114689 b: refs/heads/master c: f4cfb18d7917ecb397b3497e931a2a23175709b7 h: refs/heads/master i: 114687: b5e6a135573c779a59c8ee52a2b1c8f9dfd54520 v: v3 --- [refs] | 2 +- trunk/fs/binfmt_flat.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/[refs] b/[refs] index db7e7c024746..2f4342aada96 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 0c6aa2639ea83bfb7f91d72118bad70b3f60012a +refs/heads/master: f4cfb18d7917ecb397b3497e931a2a23175709b7 diff --git a/trunk/fs/binfmt_flat.c b/trunk/fs/binfmt_flat.c index dfc0197905ca..ccb781a6a804 100644 --- a/trunk/fs/binfmt_flat.c +++ b/trunk/fs/binfmt_flat.c @@ -229,13 +229,13 @@ static int decompress_exec( ret = 10; if (buf[3] & EXTRA_FIELD) { ret += 2 + buf[10] + (buf[11] << 8); - if (unlikely(LBUFSIZE == ret)) { + if (unlikely(LBUFSIZE <= ret)) { DBG_FLT("binfmt_flat: buffer overflow (EXTRA)?\n"); goto out_free_buf; } } if (buf[3] & ORIG_NAME) { - for (; ret < LBUFSIZE && (buf[ret] != 0); ret++) + while (ret < LBUFSIZE && buf[ret++] != 0) ; if (unlikely(LBUFSIZE == ret)) { DBG_FLT("binfmt_flat: buffer overflow (ORIG_NAME)?\n"); @@ -243,7 +243,7 @@ static int decompress_exec( } } if (buf[3] & COMMENT) { - for (; ret < LBUFSIZE && (buf[ret] != 0); ret++) + while (ret < LBUFSIZE && buf[ret++] != 0) ; if (unlikely(LBUFSIZE == ret)) { DBG_FLT("binfmt_flat: buffer overflow (COMMENT)?\n");