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

Commit 8f3f655d authored by Al Viro's avatar Al Viro
Browse files

[PATCH] fix regular readdir() and friends 



Handling of -EOVERFLOW.

Signed-off-by: default avatarAl Viro <viro@zeniv.linux.org.uk>
parent da574983

fs/compat.c

+6 −2
Original line number Diff line number Diff line
@@ -792,8 +792,10 @@ static int compat_fillonedir(void *__buf, const char *name, int namlen, 
	if (buf->result)

		return -EINVAL;

	d_ino = ino;

	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)

	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) {

		buf->result = -EOVERFLOW;

		return -EOVERFLOW;

	}

	buf->result++;

	dirent = buf->dirent;

	if (!access_ok(VERIFY_WRITE, dirent,
@@ -862,8 +864,10 @@ static int compat_filldir(void *__buf, const char *name, int namlen, 
	if (reclen > buf->count)

		return -EINVAL;

	d_ino = ino;

	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)

	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) {

		buf->error = -EOVERFLOW;

		return -EOVERFLOW;

	}

	dirent = buf->previous;

	if (dirent) {

		if (__put_user(offset, &dirent->d_off))

fs/readdir.c

+6 −2
Original line number Diff line number Diff line
@@ -80,8 +80,10 @@ static int fillonedir(void * __buf, const char * name, int namlen, loff_t offset 
	if (buf->result)

		return -EINVAL;

	d_ino = ino;

	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)

	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) {

		buf->result = -EOVERFLOW;

		return -EOVERFLOW;

	}

	buf->result++;

	dirent = buf->dirent;

	if (!access_ok(VERIFY_WRITE, dirent,
@@ -155,8 +157,10 @@ static int filldir(void * __buf, const char * name, int namlen, loff_t offset, 
	if (reclen > buf->count)

		return -EINVAL;

	d_ino = ino;

	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino)

	if (sizeof(d_ino) < sizeof(ino) && d_ino != ino) {

		buf->error = -EOVERFLOW;

		return -EOVERFLOW;

	}

	dirent = buf->previous;

	if (dirent) {

		if (__put_user(offset, &dirent->d_off))