diff options
| author | Anders Roxell <anders.roxell@linaro.org> | 2015-02-16 13:40:54 +0100 |
|---|---|---|
| committer | Anders Roxell <anders.roxell@linaro.org> | 2015-02-16 13:40:54 +0100 |
| commit | cdc764f571a7aa071025c0c36eaff55bfd03bd9f (patch) | |
| tree | 51c46ce76580753f9aef01b8b1518db6efb57cb8 /lib | |
| parent | 4ca5efa716faec2f7473f46f56512f0ec89dd383 (diff) | |
| parent | 016ea480c9ca2344006d3ef592a0154ba03b507a (diff) | |
Merge tag 'v3.14.31' into v3.14-rt
This is the 3.14.31 stable release
Signed-off-by: Anders Roxell <anders.roxell@linaro.org>
Conflicts:
drivers/gpu/drm/i915/i915_gem.c
mm/page_alloc.c
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/decompress_bunzip2.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/decompress_bunzip2.c b/lib/decompress_bunzip2.c index 31c5f7675fbf..f504027d66a8 100644 --- a/lib/decompress_bunzip2.c +++ b/lib/decompress_bunzip2.c @@ -184,7 +184,7 @@ static int INIT get_next_block(struct bunzip_data *bd) if (get_bits(bd, 1)) return RETVAL_OBSOLETE_INPUT; origPtr = get_bits(bd, 24); - if (origPtr > dbufSize) + if (origPtr >= dbufSize) return RETVAL_DATA_ERROR; /* mapping table: if some byte values are never used (encoding things like ascii text), the compression code removes the gaps to have fewer |