aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFlorian Fainelli <florian@openwrt.org>2011-08-02 18:55:38 +0000
committerFlorian Fainelli <florian@openwrt.org>2011-08-02 18:55:38 +0000
commitc4af036ec73d84d04e5299f5749cc5103988b15f (patch)
tree0954f315cb6e84c38a545492636a88b4e9718140
parent54d97e6782a85c81e1965271ed76af9549f8cce3 (diff)
downloadupstream-c4af036ec73d84d04e5299f5749cc5103988b15f.tar.gz
upstream-c4af036ec73d84d04e5299f5749cc5103988b15f.tar.bz2
upstream-c4af036ec73d84d04e5299f5749cc5103988b15f.zip
refresh 3.0 patches
SVN-Revision: 27879
-rw-r--r--target/linux/generic/patches-3.0/501-yaffs_cvs_2009_04_24.patch8
-rw-r--r--target/linux/generic/patches-3.0/610-netfilter_match_bypass_default_checks.patch8
2 files changed, 8 insertions, 8 deletions
diff --git a/target/linux/generic/patches-3.0/501-yaffs_cvs_2009_04_24.patch b/target/linux/generic/patches-3.0/501-yaffs_cvs_2009_04_24.patch
index c40da10d69..c334b17d08 100644
--- a/target/linux/generic/patches-3.0/501-yaffs_cvs_2009_04_24.patch
+++ b/target/linux/generic/patches-3.0/501-yaffs_cvs_2009_04_24.patch
@@ -11038,14 +11038,14 @@
+ yaffs_UnpackTags2(tags, &pt);
+ }
+ }
-
-- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
-- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
++
+ if (localData)
+ yaffs_ReleaseTempBuffer(dev, data, __LINE__);
+- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
+ if (tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
-+ tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
+ tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
+-
if (retval == 0)
return YAFFS_OK;
else
diff --git a/target/linux/generic/patches-3.0/610-netfilter_match_bypass_default_checks.patch b/target/linux/generic/patches-3.0/610-netfilter_match_bypass_default_checks.patch
index b8ba5f7dc6..4760c8ad85 100644
--- a/target/linux/generic/patches-3.0/610-netfilter_match_bypass_default_checks.patch
+++ b/target/linux/generic/patches-3.0/610-netfilter_match_bypass_default_checks.patch
@@ -73,10 +73,11 @@
counters = alloc_counters(table);
if (IS_ERR(counters))
-@@ -962,6 +988,14 @@ copy_entries_to_user(unsigned int total_
+@@ -961,6 +987,14 @@ copy_entries_to_user(unsigned int total_
+ ret = -EFAULT;
goto free_counters;
}
-
++
+ flags = e->ip.flags & IPT_F_MASK;
+ if (copy_to_user(userptr + off
+ + offsetof(struct ipt_entry, ip.flags),
@@ -84,7 +85,6 @@
+ ret = -EFAULT;
+ goto free_counters;
+ }
-+
+
for (i = sizeof(struct ipt_entry);
i < e->target_offset;
- i += m->u.match_size) {