Browse Source

merge r17683 to 2.6.30

SVN-Revision: 17701
Felix Fietkau 16 years ago
parent
commit
81a9b94ba1

+ 4 - 1
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 <[email protected]>
@@ -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;
 +