From: Dwight Engen <dwight.engen@oracle.com>
To: xfs@oss.sgi.com
Subject: [PATCH v4 6/7] xfs: check that eofblocks ioctl caller can write matched inodes
Date: Wed, 17 Jul 2013 11:47:46 -0400 [thread overview]
Message-ID: <20130717114746.4e133042@oracle.com> (raw)
Signed-off-by: Dwight Engen <dwight.engen@oracle.com>
---
fs/xfs/xfs_fs.h | 1 +
fs/xfs/xfs_icache.c | 4 ++++
fs/xfs/xfs_ioctl.c | 2 ++
3 files changed, 7 insertions(+)
diff --git a/fs/xfs/xfs_fs.h b/fs/xfs/xfs_fs.h
index 7eb4a5e..aee4b12 100644
--- a/fs/xfs/xfs_fs.h
+++ b/fs/xfs/xfs_fs.h
@@ -361,6 +361,7 @@ struct xfs_fs_eofblocks {
#define XFS_EOF_FLAGS_GID (1 << 2) /* filter by gid */
#define XFS_EOF_FLAGS_PRID (1 << 3) /* filter by project id */
#define XFS_EOF_FLAGS_MINFILESIZE (1 << 4) /* filter by min file size */
+#define XFS_EOF_FLAGS_PERM_CHECK (1 << 5) /* check can write inode */
#define XFS_EOF_FLAGS_VALID \
(XFS_EOF_FLAGS_SYNC | \
XFS_EOF_FLAGS_UID | \
diff --git a/fs/xfs/xfs_icache.c b/fs/xfs/xfs_icache.c
index d873ab9e..728283a 100644
--- a/fs/xfs/xfs_icache.c
+++ b/fs/xfs/xfs_icache.c
@@ -1247,6 +1247,10 @@ xfs_inode_free_eofblocks(
if (!xfs_inode_match_id(ip, eofb))
return 0;
+ if (eofb->eof_flags & XFS_EOF_FLAGS_PERM_CHECK &&
+ inode_permission(VFS_I(ip), MAY_WRITE))
+ return 0;
+
/* skip the inode if the file size is too small */
if (eofb->eof_flags & XFS_EOF_FLAGS_MINFILESIZE &&
XFS_ISIZE(ip) < eofb->eof_min_file_size)
diff --git a/fs/xfs/xfs_ioctl.c b/fs/xfs/xfs_ioctl.c
index abbbdcf..e63e359 100644
--- a/fs/xfs/xfs_ioctl.c
+++ b/fs/xfs/xfs_ioctl.c
@@ -1636,6 +1636,8 @@ xfs_file_ioctl(
!gid_valid(keofb.eof_gid))
return XFS_ERROR(EINVAL);
+ keofb.eof_flags |= XFS_EOF_FLAGS_PERM_CHECK;
+
error = xfs_icache_free_eofblocks(mp, &keofb);
return -error;
}
--
1.8.1.4
_______________________________________________
xfs mailing list
xfs@oss.sgi.com
http://oss.sgi.com/mailman/listinfo/xfs
next reply other threads:[~2013-07-17 15:47 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-07-17 15:47 Dwight Engen [this message]
2013-07-19 6:02 ` [PATCH v4 6/7] xfs: check that eofblocks ioctl caller can write matched inodes Dave Chinner
2013-07-19 16:13 ` Dwight Engen
2013-07-24 3:40 ` Dave Chinner
2013-07-22 16:00 ` Dwight Engen
2013-07-24 3:46 ` Dave Chinner
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=20130717114746.4e133042@oracle.com \
--to=dwight.engen@oracle.com \
--cc=xfs@oss.sgi.com \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.