aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic-2.6
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2009-09-24 19:31:57 +0000
committerFelix Fietkau <nbd@openwrt.org>2009-09-24 19:31:57 +0000
commit81a9b94ba11ddb09d292372444c2b3a66b91b232 (patch)
tree99f1f242f19edb8c3303361f21e6393776733be7 /target/linux/generic-2.6
parenteae1270eaf34cc9482c1dee54424467bd6377eed (diff)
downloadupstream-81a9b94ba11ddb09d292372444c2b3a66b91b232.tar.gz
upstream-81a9b94ba11ddb09d292372444c2b3a66b91b232.tar.bz2
upstream-81a9b94ba11ddb09d292372444c2b3a66b91b232.zip
merge r17683 to 2.6.30
SVN-Revision: 17701
Diffstat (limited to 'target/linux/generic-2.6')
-rw-r--r--target/linux/generic-2.6/patches-2.6.30/052-pcomp_lzma_support.patch5
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;
+