From: Florian Fainelli <florian@openwrt.org>
Date: Tue, 2 Aug 2011 18:55:38 +0000 (+0000)
Subject: refresh 3.0 patches
X-Git-Tag: reboot~16117
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=c4af036ec73d84d04e5299f5749cc5103988b15f;p=oweals%2Fopenwrt.git

refresh 3.0 patches

SVN-Revision: 27879
---

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) {