diff mbox

Fix btrfs_file_llseek() to return -EINVAL directly

Message ID 4E5C6009.6020908@oracle.com (mailing list archive)
State New, archived
Headers show

Commit Message

jeff.liu Aug. 30, 2011, 3:59 a.m. UTC 
Sorry, I forgot unlocking inode before returning -EINVAL in the previous 
patch, thanks Tao pointing this out!

 From 1825149c67cbfe7cbafcee4156e1f301dade7b0b Mon Sep 17 00:00:00 2001
From: Jie Liu <jeff.liu@oracle.com>
Date: Tue, 30 Aug 2011 11:51:00 +0800
Subject: [PATCH 1/1] Return -EINVAL ranther than offset if offset < 0 or 
offset >
  inode->i_sb->s_maxbytes.

Reported-by: Tao Ma <tm@tao.ma>
Signed-off-by: Jie Liu <jeff.liu@oracle.com>
---
  fs/btrfs/file.c |    9 +++++++--
  1 files changed, 7 insertions(+), 2 deletions(-)

              mutex_unlock(&inode->i_mutex);
@@ -1821,11 +1826,11 @@ static loff_t btrfs_file_llseek(struct file 
*file, loff_t offset, int origin)
      }

      if (offset < 0 && !(file->f_mode & FMODE_UNSIGNED_OFFSET)) {
-        ret = -EINVAL;
+        offset = -EINVAL;
          goto out;
      }
      if (offset > inode->i_sb->s_maxbytes) {
-        ret = -EINVAL;
+        offset = -EINVAL;
          goto out;
      }
diff mbox

Patch

diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c
index e7872e4..082ae91 100644
--- a/fs/btrfs/file.c
+++ b/fs/btrfs/file.c
@@ -1813,6 +1813,11 @@  static loff_t btrfs_file_llseek(struct file 
*file, loff_t offset, int origin)
          goto out;
      case SEEK_DATA:
      case SEEK_HOLE:
+        if (offset >= inode->i_size) {
+            mutex_unlock(&inode->i_mutex);
+            return -ENXIO;
+        }
+
          ret = find_desired_extent(inode, &offset, origin);
          if (ret) {