openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

[JFFS2] Correct buggy length checks 

The previous changes introduced wrong length calculations.

Signed-off-by: Artem B. Bityutskiy <dedekind@infradead.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
This commit is contained in:
Artem B. Bityutskiy 2005-08-04 12:40:02 +01:00 committed by Thomas Gleixner
parent 392435081e
commit 3c09133739
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
fs/jffs2/nodelist.c
View File

@ -7,7 +7,7 @@
*
* For licensing information, see the file 'LICENCE' in this directory.
*
* $Id: nodelist.c,v 1.107 2005/08/03 09:26:46 dedekind Exp $
* $Id: nodelist.c,v 1.108 2005/08/04 11:39:59 dedekind Exp $
*
*/
@ -412,7 +412,7 @@ static int check_node_data(struct jffs2_sb_info *c, struct jffs2_tmp_dnode_info
/* Calculate how many bytes were already checked */
ofs = ref_offset(ref) + sizeof(struct jffs2_raw_inode);
len = ofs - (ofs & (PAGE_CACHE_SIZE - 1));
len = ofs & (c->wbuf_pagesize - 1);
len = c->wbuf_pagesize - len;
if (len >= tn->csize) {

4
fs/jffs2/readinode.c
View File

@ -7,7 +7,7 @@
*
* For licensing information, see the file 'LICENCE' in this directory.
*
* $Id: readinode.c,v 1.137 2005/08/03 09:26:46 dedekind Exp $
* $Id: readinode.c,v 1.138 2005/08/03 09:28:06 dedekind Exp $
*
*/
@ -278,7 +278,7 @@ static inline int read_dnode(struct jffs2_sb_info *c, struct jffs2_raw_node_ref
/* If we actually calculated the whole data CRC
* and it is wrong, drop the node. */
if (len == csize && unlikely(tn->partial_crc != je32_to_cpu(rd->data_crc))) {
if (len >= csize && unlikely(tn->partial_crc != je32_to_cpu(rd->data_crc))) {
JFFS2_NOTICE("wrong data CRC in data node at 0x%08x: read %#08x, calculated %#08x.\n",
ref_offset(ref), tn->partial_crc, je32_to_cpu(rd->data_crc));
goto free_out;