diff options
author | Al Viro <viro@zeniv.linux.org.uk> | 2012-02-06 12:45:27 -0500 |
---|---|---|
committer | Al Viro <viro@zeniv.linux.org.uk> | 2012-03-20 21:29:32 -0400 |
commit | 8de52778798fe39660a8d6b26f290e0c93202761 (patch) | |
tree | 56384beb7863c1f338f2b66b509bf58eea5a99c2 /fs/xfs | |
parent | c16fa4f2ad19908a47c63d8fa436a1178438c7e7 (diff) |
vfs: check i_nlink limits in vfs_{mkdir,rename_dir,link}
New field of struct super_block - ->s_max_links. Maximal allowed
value of ->i_nlink or 0; in the latter case all checks still need
to be done in ->link/->mkdir/->rename instances. Note that this
limit applies both to directoris and to non-directories.
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Diffstat (limited to 'fs/xfs')
-rw-r--r-- | fs/xfs/xfs_rename.c | 11 | ||||
-rw-r--r-- | fs/xfs/xfs_super.c | 1 | ||||
-rw-r--r-- | fs/xfs/xfs_utils.c | 2 | ||||
-rw-r--r-- | fs/xfs/xfs_vnodeops.c | 16 |
4 files changed, 1 insertions, 29 deletions
diff --git a/fs/xfs/xfs_rename.c b/fs/xfs/xfs_rename.c index 866de277079..e44ef7ee8ce 100644 --- a/fs/xfs/xfs_rename.c +++ b/fs/xfs/xfs_rename.c | |||
@@ -118,17 +118,6 @@ xfs_rename( | |||
118 | new_parent = (src_dp != target_dp); | 118 | new_parent = (src_dp != target_dp); |
119 | src_is_directory = S_ISDIR(src_ip->i_d.di_mode); | 119 | src_is_directory = S_ISDIR(src_ip->i_d.di_mode); |
120 | 120 | ||
121 | if (src_is_directory) { | ||
122 | /* | ||
123 | * Check for link count overflow on target_dp | ||
124 | */ | ||
125 | if (target_ip == NULL && new_parent && | ||
126 | target_dp->i_d.di_nlink >= XFS_MAXLINK) { | ||
127 | error = XFS_ERROR(EMLINK); | ||
128 | goto std_return; | ||
129 | } | ||
130 | } | ||
131 | |||
132 | xfs_sort_for_rename(src_dp, target_dp, src_ip, target_ip, | 121 | xfs_sort_for_rename(src_dp, target_dp, src_ip, target_ip, |
133 | inodes, &num_inodes); | 122 | inodes, &num_inodes); |
134 | 123 | ||
diff --git a/fs/xfs/xfs_super.c b/fs/xfs/xfs_super.c index ee5b695c99a..0e4c5c017fb 100644 --- a/fs/xfs/xfs_super.c +++ b/fs/xfs/xfs_super.c | |||
@@ -1341,6 +1341,7 @@ xfs_fs_fill_super( | |||
1341 | sb->s_blocksize = mp->m_sb.sb_blocksize; | 1341 | sb->s_blocksize = mp->m_sb.sb_blocksize; |
1342 | sb->s_blocksize_bits = ffs(sb->s_blocksize) - 1; | 1342 | sb->s_blocksize_bits = ffs(sb->s_blocksize) - 1; |
1343 | sb->s_maxbytes = xfs_max_file_offset(sb->s_blocksize_bits); | 1343 | sb->s_maxbytes = xfs_max_file_offset(sb->s_blocksize_bits); |
1344 | sb->s_max_links = XFS_MAXLINK; | ||
1344 | sb->s_time_gran = 1; | 1345 | sb->s_time_gran = 1; |
1345 | set_posix_acl_flag(sb); | 1346 | set_posix_acl_flag(sb); |
1346 | 1347 | ||
diff --git a/fs/xfs/xfs_utils.c b/fs/xfs/xfs_utils.c index 89dbb4a5087..79c05ac85bf 100644 --- a/fs/xfs/xfs_utils.c +++ b/fs/xfs/xfs_utils.c | |||
@@ -296,8 +296,6 @@ xfs_bumplink( | |||
296 | xfs_trans_t *tp, | 296 | xfs_trans_t *tp, |
297 | xfs_inode_t *ip) | 297 | xfs_inode_t *ip) |
298 | { | 298 | { |
299 | if (ip->i_d.di_nlink >= XFS_MAXLINK) | ||
300 | return XFS_ERROR(EMLINK); | ||
301 | xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG); | 299 | xfs_trans_ichgtime(tp, ip, XFS_ICHGTIME_CHG); |
302 | 300 | ||
303 | ASSERT(ip->i_d.di_nlink > 0); | 301 | ASSERT(ip->i_d.di_nlink > 0); |
diff --git a/fs/xfs/xfs_vnodeops.c b/fs/xfs/xfs_vnodeops.c index ebdb88840a4..64981d7e737 100644 --- a/fs/xfs/xfs_vnodeops.c +++ b/fs/xfs/xfs_vnodeops.c | |||
@@ -917,14 +917,6 @@ xfs_create( | |||
917 | xfs_ilock(dp, XFS_ILOCK_EXCL | XFS_ILOCK_PARENT); | 917 | xfs_ilock(dp, XFS_ILOCK_EXCL | XFS_ILOCK_PARENT); |
918 | unlock_dp_on_error = B_TRUE; | 918 | unlock_dp_on_error = B_TRUE; |
919 | 919 | ||
920 | /* | ||
921 | * Check for directory link count overflow. | ||
922 | */ | ||
923 | if (is_dir && dp->i_d.di_nlink >= XFS_MAXLINK) { | ||
924 | error = XFS_ERROR(EMLINK); | ||
925 | goto out_trans_cancel; | ||
926 | } | ||
927 | |||
928 | xfs_bmap_init(&free_list, &first_block); | 920 | xfs_bmap_init(&free_list, &first_block); |
929 | 921 | ||
930 | /* | 922 | /* |
@@ -1429,14 +1421,6 @@ xfs_link( | |||
1429 | xfs_trans_ijoin(tp, tdp, XFS_ILOCK_EXCL); | 1421 | xfs_trans_ijoin(tp, tdp, XFS_ILOCK_EXCL); |
1430 | 1422 | ||
1431 | /* | 1423 | /* |
1432 | * If the source has too many links, we can't make any more to it. | ||
1433 | */ | ||
1434 | if (sip->i_d.di_nlink >= XFS_MAXLINK) { | ||
1435 | error = XFS_ERROR(EMLINK); | ||
1436 | goto error_return; | ||
1437 | } | ||
1438 | |||
1439 | /* | ||
1440 | * If we are using project inheritance, we only allow hard link | 1424 | * If we are using project inheritance, we only allow hard link |
1441 | * creation in our tree when the project IDs are the same; else | 1425 | * creation in our tree when the project IDs are the same; else |
1442 | * the tree quota mechanism could be circumvented. | 1426 | * the tree quota mechanism could be circumvented. |