mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-25 10:15:11 +02:00
[kernel] refresh 2.6.35 patches
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@22799 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
a86afacc84
commit
5bf465d772
@ -132,11 +132,10 @@
|
|||||||
|
|
||||||
e = (struct ipt_entry *)(loc_cpu_entry + off);
|
e = (struct ipt_entry *)(loc_cpu_entry + off);
|
||||||
if (copy_to_user(userptr + off
|
if (copy_to_user(userptr + off
|
||||||
@@ -979,6 +1020,14 @@ copy_entries_to_user(unsigned int total_
|
@@ -980,6 +1021,14 @@ copy_entries_to_user(unsigned int total_
|
||||||
ret = -EFAULT;
|
|
||||||
goto free_counters;
|
goto free_counters;
|
||||||
}
|
}
|
||||||
+
|
|
||||||
+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
|
+ flags = e->ip.flags & ~IPT_F_NO_DEF_MATCH;
|
||||||
+ if (copy_to_user(userptr + off
|
+ if (copy_to_user(userptr + off
|
||||||
+ + offsetof(struct ipt_entry, ip.flags),
|
+ + offsetof(struct ipt_entry, ip.flags),
|
||||||
@ -144,6 +143,7 @@
|
|||||||
+ ret = -EFAULT;
|
+ ret = -EFAULT;
|
||||||
+ goto free_counters;
|
+ goto free_counters;
|
||||||
+ }
|
+ }
|
||||||
|
+
|
||||||
for (i = sizeof(struct ipt_entry);
|
for (i = sizeof(struct ipt_entry);
|
||||||
i < e->target_offset;
|
i < e->target_offset;
|
||||||
|
i += m->u.match_size) {
|
||||||
|
@ -11038,14 +11038,14 @@
|
|||||||
+ yaffs_UnpackTags2(tags, &pt);
|
+ yaffs_UnpackTags2(tags, &pt);
|
||||||
+ }
|
+ }
|
||||||
+ }
|
+ }
|
||||||
+
|
|
||||||
|
- if(tags && retval == -EBADMSG && tags->eccResult == YAFFS_ECC_RESULT_NO_ERROR)
|
||||||
|
- tags->eccResult = YAFFS_ECC_RESULT_UNFIXED;
|
||||||
+ if (localData)
|
+ if (localData)
|
||||||
+ yaffs_ReleaseTempBuffer(dev, data, __LINE__);
|
+ 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)
|
+ 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)
|
if (retval == 0)
|
||||||
return YAFFS_OK;
|
return YAFFS_OK;
|
||||||
else
|
else
|
||||||
|
Loading…
Reference in New Issue
Block a user