aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2009-09-23 09:30:31 +0000
committerGabor Juhos <juhosg@openwrt.org>2009-09-23 09:30:31 +0000
commit60132f56f74f6a6881173372094e58de06b14fe5 (patch)
tree87ef9f367474ce65b3cb1c6e7d127f18f7e6f013
parentc9bc7c504c61a0d935573c86657222b067037193 (diff)
downloadupstream-60132f56f74f6a6881173372094e58de06b14fe5.tar.gz
upstream-60132f56f74f6a6881173372094e58de06b14fe5.tar.bz2
upstream-60132f56f74f6a6881173372094e58de06b14fe5.zip
kernel: check return code of nla_parse in pcomp_lzma on 2.6.31
SVN-Revision: 17683
-rw-r--r--target/linux/generic-2.6/patches-2.6.31/052-pcomp_lzma_support.patch5
1 files changed, 4 insertions, 1 deletions
diff --git a/target/linux/generic-2.6/patches-2.6.31/052-pcomp_lzma_support.patch b/target/linux/generic-2.6/patches-2.6.31/052-pcomp_lzma_support.patch
index ff2302c987..48eb07de7e 100644
--- a/target/linux/generic-2.6/patches-2.6.31/052-pcomp_lzma_support.patch
+++ b/target/linux/generic-2.6/patches-2.6.31/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;
+