mirror of https://github.com/hak5/openwrt-owl.git
parent
e86e41d663
commit
24726a0cdc
|
@ -1,6 +1,6 @@
|
||||||
--- a/arch/mips/kernel/machine_kexec.c 2010-03-15 15:52:04.000000000 +0000
|
--- a/arch/mips/kernel/machine_kexec.c
|
||||||
+++ b/arch/mips/kernel/machine_kexec.c 2010-03-29 12:10:37.000000000 +0100
|
+++ b/arch/mips/kernel/machine_kexec.c
|
||||||
@@ -52,7 +52,7 @@
|
@@ -52,7 +52,7 @@ machine_kexec(struct kimage *image)
|
||||||
reboot_code_buffer =
|
reboot_code_buffer =
|
||||||
(unsigned long)page_address(image->control_code_page);
|
(unsigned long)page_address(image->control_code_page);
|
||||||
|
|
||||||
|
|
|
@ -127,10 +127,11 @@
|
||||||
|
|
||||||
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
|
||||||
@@ -988,6 +1028,14 @@ copy_entries_to_user(unsigned int total_
|
@@ -987,6 +1027,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),
|
||||||
|
@ -138,7 +139,6 @@
|
||||||
+ 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