diff options
author | Felix Fietkau <nbd@openwrt.org> | 2009-09-24 19:31:57 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2009-09-24 19:31:57 +0000 |
commit | c346ac33dc9341da4055d56b229123e1fc955fab (patch) | |
tree | d8d0ea94a4ba8a9ff1bcf3f2169958c6640dd54c | |
parent | 017ab32e101de2f805b8028ff3a24cc4a66d6974 (diff) | |
download | upstream-c346ac33dc9341da4055d56b229123e1fc955fab.tar.gz upstream-c346ac33dc9341da4055d56b229123e1fc955fab.tar.bz2 upstream-c346ac33dc9341da4055d56b229123e1fc955fab.zip |
merge r17683 to 2.6.30
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17701 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r-- | target/linux/generic-2.6/patches-2.6.30/052-pcomp_lzma_support.patch | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.30/052-pcomp_lzma_support.patch b/target/linux/generic-2.6/patches-2.6.30/052-pcomp_lzma_support.patch index 2626d0316b..d20285c5cf 100644 --- a/target/linux/generic-2.6/patches-2.6.30/052-pcomp_lzma_support.patch +++ b/target/linux/generic-2.6/patches-2.6.30/052-pcomp_lzma_support.patch @@ -1,6 +1,6 @@ --- /dev/null +++ b/crypto/unlzma.c -@@ -0,0 +1,772 @@ +@@ -0,0 +1,775 @@ +/* + * LZMA uncompresion module for pcomp + * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org> @@ -636,6 +636,9 @@ + return -EINVAL; + + ret = nla_parse(tb, UNLZMA_DECOMP_MAX, p, len, NULL); ++ if (ret) ++ return ret; ++ + if (!tb[UNLZMA_DECOMP_OUT_BUFFERS]) + return -EINVAL; + |