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 c40da10d69ff90418909ecf9a37ff8da68375ef4..c334b17d0872a877f52cd9c0e4234ad118df7d09 100644 (file)
--- 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 b8ba5f7dc6ef7d1d1abe40b1aaad83764a03499d..4760c8ad85e5c229f6d2df156461de7d9ddf60a2 100644 (file)
--- 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) {