Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 22735068 authored by Josef Bacik's avatar Josef Bacik Committed by Al Viro
Browse files

drivers: fix up various ->llseek() implementations 



Fix up a few ->llseek() implementations that won't deal with SEEK_HOLE/SEEK_DATA
properly.  Make them future proof so that if we ever add new options they will
return -EINVAL.  Thanks,

Signed-off-by: default avatarJosef Bacik <josef@redhat.com>
Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent 06222e49

drivers/char/generic_nvram.c

+4 −0
Original line number Diff line number Diff line
@@ -34,12 +34,16 @@ static ssize_t nvram_len; 
static loff_t nvram_llseek(struct file *file, loff_t offset, int origin)

{

	switch (origin) {

	case 0:

		break;

	case 1:

		offset += file->f_pos;

		break;

	case 2:

		offset += nvram_len;

		break;

	default:

		offset = -1;

	}

	if (offset < 0)

		return -EINVAL;

drivers/char/nvram.c

+2 −0
Original line number Diff line number Diff line
@@ -224,6 +224,8 @@ static loff_t nvram_llseek(struct file *file, loff_t offset, int origin) 
	case 2:

		offset += NVRAM_BYTES;

		break;

	default:

		return -EINVAL;

	}



	return (offset >= 0) ? (file->f_pos = offset) : -EINVAL;

drivers/char/ps3flash.c

+4 −0
Original line number Diff line number Diff line
@@ -101,12 +101,16 @@ static loff_t ps3flash_llseek(struct file *file, loff_t offset, int origin) 


	mutex_lock(&file->f_mapping->host->i_mutex);

	switch (origin) {

	case 0:

		break;

	case 1:

		offset += file->f_pos;

		break;

	case 2:

		offset += dev->regions[dev->region_idx].size*dev->blk_size;

		break;

	default:

		offset = -1;

	}

	if (offset < 0) {

		res = -EINVAL;

drivers/macintosh/nvram.c

+4 −0
Original line number Diff line number Diff line
@@ -21,12 +21,16 @@ 
static loff_t nvram_llseek(struct file *file, loff_t offset, int origin)

{

	switch (origin) {

	case 0:

		break;

	case 1:

		offset += file->f_pos;

		break;

	case 2:

		offset += NVRAM_SIZE;

		break;

	default:

		offset = -1;

	}

	if (offset < 0)

		return -EINVAL;