From: Felix Fietkau <nbd@openwrt.org>
Date: Thu, 24 Sep 2009 19:31:57 +0000 (+0000)
Subject: merge r17683 to 2.6.30
X-Git-Tag: reboot~22392
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=81a9b94ba11ddb09d292372444c2b3a66b91b232;p=oweals%2Fopenwrt.git

merge r17683 to 2.6.30

SVN-Revision: 17701
---

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;
 +