diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-13 16:00:36 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-12-13 16:00:36 -0500 |
| commit | 78a45c6f067824cf5d0a9fedea7339ac2e28603c (patch) | |
| tree | b4f78c8b6b9059ddace0a18c11629b8d2045f793 /lib/decompress_bunzip2.c | |
| parent | f96fe225677b3efb74346ebd56fafe3997b02afa (diff) | |
| parent | 29d293b6007b91a4463f05bc8d0b26e0e65c5816 (diff) | |
Merge branch 'akpm' (second patch-bomb from Andrew)
Merge second patchbomb from Andrew Morton:
- the rest of MM
- misc fs fixes
- add execveat() syscall
- new ratelimit feature for fault-injection
- decompressor updates
- ipc/ updates
- fallocate feature creep
- fsnotify cleanups
- a few other misc things
* emailed patches from Andrew Morton <akpm@linux-foundation.org>: (99 commits)
cgroups: Documentation: fix trivial typos and wrong paragraph numberings
parisc: percpu: update comments referring to __get_cpu_var
percpu: update local_ops.txt to reflect this_cpu operations
percpu: remove __get_cpu_var and __raw_get_cpu_var macros
fsnotify: remove destroy_list from fsnotify_mark
fsnotify: unify inode and mount marks handling
fallocate: create FAN_MODIFY and IN_MODIFY events
mm/cma: make kmemleak ignore CMA regions
slub: fix cpuset check in get_any_partial
slab: fix cpuset check in fallback_alloc
shmdt: use i_size_read() instead of ->i_size
ipc/shm.c: fix overly aggressive shmdt() when calls span multiple segments
ipc/msg: increase MSGMNI, remove scaling
ipc/sem.c: increase SEMMSL, SEMMNI, SEMOPM
ipc/sem.c: change memory barrier in sem_lock() to smp_rmb()
lib/decompress.c: consistency of compress formats for kernel image
decompress_bunzip2: off by one in get_next_block()
usr/Kconfig: make initrd compression algorithm selection not expert
fault-inject: add ratelimit option
ratelimit: add initialization macro
...
Diffstat (limited to 'lib/decompress_bunzip2.c')
| -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 8290e0bef7ea..6dd0335ea61b 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) | |||
| 184 | if (get_bits(bd, 1)) | 184 | if (get_bits(bd, 1)) |
| 185 | return RETVAL_OBSOLETE_INPUT; | 185 | return RETVAL_OBSOLETE_INPUT; |
| 186 | origPtr = get_bits(bd, 24); | 186 | origPtr = get_bits(bd, 24); |
| 187 | if (origPtr > dbufSize) | 187 | if (origPtr >= dbufSize) |
| 188 | return RETVAL_DATA_ERROR; | 188 | return RETVAL_DATA_ERROR; |
| 189 | /* mapping table: if some byte values are never used (encoding things | 189 | /* mapping table: if some byte values are never used (encoding things |
| 190 | like ascii text), the compression code removes the gaps to have fewer | 190 | like ascii text), the compression code removes the gaps to have fewer |