merge r17683 to 2.6.30

SVN-Revision: 17701
This commit is contained in:
Felix Fietkau 2009-09-24 19:31:57 +00:00
parent eae1270eaf
commit 81a9b94ba1
1 changed files with 4 additions and 1 deletions

View File

@ -1,6 +1,6 @@
--- /dev/null --- /dev/null
+++ b/crypto/unlzma.c +++ b/crypto/unlzma.c
@@ -0,0 +1,772 @@ @@ -0,0 +1,775 @@
+/* +/*
+ * LZMA uncompresion module for pcomp + * LZMA uncompresion module for pcomp
+ * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org> + * Copyright (C) 2009 Felix Fietkau <nbd@openwrt.org>
@ -636,6 +636,9 @@
+ return -EINVAL; + return -EINVAL;
+ +
+ ret = nla_parse(tb, UNLZMA_DECOMP_MAX, p, len, NULL); + ret = nla_parse(tb, UNLZMA_DECOMP_MAX, p, len, NULL);
+ if (ret)
+ return ret;
+
+ if (!tb[UNLZMA_DECOMP_OUT_BUFFERS]) + if (!tb[UNLZMA_DECOMP_OUT_BUFFERS])
+ return -EINVAL; + return -EINVAL;
+ +