mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Phillip Lougher <phillip@squashfs.org.uk>
To: linux-kernel@vger.kernel.org, linux-fsdevel@vger.kernel.org
Cc: Phillip Lougher <phillip@squashfs.org.uk>
Subject: [PATCH 1/5] Squashfs: fix corruption check in get_dir_index_using_name()
Date: Fri,  6 Sep 2013 04:54:37 +0100	[thread overview]
Message-ID: <1378439682-12830-2-git-send-email-phillip@squashfs.org.uk> (raw)
In-Reply-To: <1378439682-12830-1-git-send-email-phillip@squashfs.org.uk>

Patch "Squashfs: sanity check information from disk" from
Dan Carpenter adds a missing check for corruption in the
"size" field while reading the directory index from disk.

It, however, sets err to -EINVAL, this value is not used later, and
so setting it is completely redundant.  So remove it.

Errors in reading the index are deliberately non-fatal.  If we
get an error in reading the index we just return the part of the
index we have managed to read - the index isn't essential,
just quicker.

Signed-off-by: Phillip Lougher <phillip@squashfs.org.uk>
---
 fs/squashfs/namei.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/fs/squashfs/namei.c b/fs/squashfs/namei.c
index f866d42..342a5aa 100644
--- a/fs/squashfs/namei.c
+++ b/fs/squashfs/namei.c
@@ -104,10 +104,8 @@ static int get_dir_index_using_name(struct super_block *sb,
 
 
 		size = le32_to_cpu(index->size) + 1;
-		if (size > SQUASHFS_NAME_LEN) {
-			err = -EINVAL;
+		if (size > SQUASHFS_NAME_LEN)
 			break;
-		}
 
 		err = squashfs_read_metadata(sb, index->name, &index_start,
 					&index_offset, size);
-- 
1.8.3.2


  reply	other threads:[~2013-09-06  4:03 UTC|newest]

Thread overview: 6+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2013-09-06  3:54 [PATCH 0/5] Squashfs: extra sanity checks and sanity check fixes Phillip Lougher
2013-09-06  3:54 ` Phillip Lougher [this message]
2013-09-06  3:54 ` [PATCH 2/5] Squashfs: fix corruption checks in squashfs_lookup() Phillip Lougher
2013-09-06  3:54 ` [PATCH 3/5] Squashfs: fix corruption checks in squashfs_readdir() Phillip Lougher
2013-09-06  3:54 ` [PATCH 4/5] Squashfs: add corruption check in get_dir_index_using_offset() Phillip Lougher
2013-09-06  3:54 ` [PATCH 5/5] Squashfs: add corruption check for type in squashfs_readdir() Phillip Lougher

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1378439682-12830-2-git-send-email-phillip@squashfs.org.uk \
    --to=phillip@squashfs.org.uk \
    --cc=linux-fsdevel@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®