Skip to content

Commit

Permalink
mtd: onenand_base: onenand_verify bugfix for writepage non-aligned ad…
Browse files Browse the repository at this point in the history
…dress

In onenand_verify function the address can be writepage non-aligned.
When a page is read for comparing the right offset should be used
for "this->verify_buf" to get the right matching with compared
"buf" buffer.

Signed-off-by: Roman Tereshonkov <roman.tereshonkov@nokia.com>
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
Acked-by: Kyungmin Park <kyungmin.park@samsung.com>
Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
  • Loading branch information
Roman Tereshonkov authored and David Woodhouse committed Mar 11, 2011
1 parent b085058 commit e6da856
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions drivers/mtd/onenand/onenand_base.c
Original file line number Diff line number Diff line change
Expand Up @@ -1648,11 +1648,10 @@ static int onenand_verify(struct mtd_info *mtd, const u_char *buf, loff_t addr,
int ret = 0;
int thislen, column;

column = addr & (this->writesize - 1);

while (len != 0) {
thislen = min_t(int, this->writesize, len);
column = addr & (this->writesize - 1);
if (column + thislen > this->writesize)
thislen = this->writesize - column;
thislen = min_t(int, this->writesize - column, len);

this->command(mtd, ONENAND_CMD_READ, addr, this->writesize);

Expand All @@ -1666,12 +1665,13 @@ static int onenand_verify(struct mtd_info *mtd, const u_char *buf, loff_t addr,

this->read_bufferram(mtd, ONENAND_DATARAM, this->verify_buf, 0, mtd->writesize);

if (memcmp(buf, this->verify_buf, thislen))
if (memcmp(buf, this->verify_buf + column, thislen))
return -EBADMSG;

len -= thislen;
buf += thislen;
addr += thislen;
column = 0;
}

return 0;
Expand Down

0 comments on commit e6da856

Please sign in to comment.