[MTD] mtdchar: Return EINVAL for bad seeks instead of fixing up to valid byte (8b491d75) · Commits · 戴 / test

mtdchar return -EINVAL for seek prior to offset 0 or to beyond the last byte in the device/partition, similar to various other seek methods, instead of fixing up to first or last byte. Signed-off-by:

Todd Poynor <tpoynor@mvista.com> Signed-off-by:

Thomas Gleixner <tglx@linutronix.de>

drivers/mtd/mtdchar.c

+6 −9

Original line number	Diff line number	Diff line
		/*
		* $Id: mtdchar.c,v 1.73 2005/07/04 17:36:41 gleixner Exp $
		* $Id: mtdchar.c,v 1.74 2005/08/04 01:05:48 tpoynor Exp $
		*
		* Character-device access to raw MTD devices.
		*
		@@ -69,26 +69,23 @@ static loff_t mtd_lseek (struct file *file, loff_t offset, int orig)
		switch (orig) {
		case 0:
		/* SEEK_SET */
		file->f_pos = offset;
		break;
		case 1:
		/* SEEK_CUR */
		file->f_pos += offset;
		offset += file->f_pos;
		break;
		case 2:
		/* SEEK_END */
		file->f_pos =mtd->size + offset;
		offset += mtd->size;
		break;
		default:
		return -EINVAL;
		}

		if (file->f_pos < 0)
		file->f_pos = 0;
		else if (file->f_pos >= mtd->size)
		file->f_pos = mtd->size - 1;
		if (offset >= 0 && offset < mtd->size)
		return file->f_pos = offset;

		return file->f_pos;
		return -EINVAL;
		}

Admin message