The patch titled
inflate_fast: sout is already a short so ptr arith was off by one.
has been removed from the -mm tree. Its filename was
inflate_fast-sout-is-already-a-short-so-ptr-arith-was-off-by-one.patch
This patch was dropped because it was merged into mainline or a subsystem tree
The current -mm tree may be found at http://userweb.kernel.org/~akpm/mmotm/
------------------------------------------------------
Subject: inflate_fast: sout is already a short so ptr arith was off by one.
From: Joakim Tjernlund <joakim.tjernlund@xxxxxxxxxxxx>
inflate_fast() can do either POST INC or PRE INC on its pointers walking
the memory to decompress. Default is PRE INC.
The sout pointer offset was miscalculated in one case as the calculation
assumed sout was a char * This breaks inflate_fast() iff configured to do
POST INC.
Signed-off-by: Joakim Tjernlund <Joakim.Tjernlund@xxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
lib/zlib_inflate/inffast.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff -puN lib/zlib_inflate/inffast.c~inflate_fast-sout-is-already-a-short-so-ptr-arith-was-off-by-one lib/zlib_inflate/inffast.c
--- a/lib/zlib_inflate/inffast.c~inflate_fast-sout-is-already-a-short-so-ptr-arith-was-off-by-one
+++ a/lib/zlib_inflate/inffast.c
@@ -286,7 +286,7 @@ void inflate_fast(z_streamp strm, unsign
} else { /* dist == 1 or dist == 2 */
unsigned short pat16;
- pat16 = *(sout-2+2*OFF);
+ pat16 = *(sout-1+OFF);
if (dist == 1) {
union uu mm;
/* copy one char pattern to both bytes */
_
Patches currently in -mm which might be from joakim.tjernlund@xxxxxxxxxxxx are
origin.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
