merge r17683 to 2.6.30

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17701 3c298f89-4303-0410-b956-a3cf2f4a3e73

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 2626d03..d20285c 100644 (file)
--- 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;
 +