Messages in this thread Patch in this message |  | | Date | Wed, 6 Dec 2000 09:11:21 +0000 (GMT) | From | Tigran Aivazian <> | Subject | [patch-2.4.0-test12-pre6] truncate(2) permissions |
| |
Hi ALexander,
This patch combines your previous patch with 2 changes I have just suggested. Both changes are obvious (and correct).
(correction to my previous message -- the immutable thing to return EPERM is not just a good idea, it is imperative and Linux already does that -- so we can drop that check from if() unconditionally, which is what the patch below does).
Tested under 2.4.0-test12-pre6.
Regards, Tigran
--- linux/fs/open.c Thu Oct 26 16:11:21 2000 +++ work/fs/open.c Wed Dec 6 08:05:43 2000 @@ -102,7 +102,12 @@ goto out; inode = nd.dentry->d_inode; - error = -EACCES; + /* For directories it's -EISDIR, for other non-regulars - -EINVAL */ + error = -EISDIR; + if (S_ISDIR(inode->i_mode)) + goto dput_and_out; + + error = -EINVAL; if (!S_ISREG(inode->i_mode)) goto dput_and_out; @@ -110,12 +115,8 @@ if (error) goto dput_and_out; - error = -EROFS; - if (IS_RDONLY(inode)) - goto dput_and_out; - error = -EPERM; - if (IS_IMMUTABLE(inode) || IS_APPEND(inode)) + if (IS_APPEND(inode)) goto dput_and_out; /* @@ -163,7 +164,7 @@ goto out; dentry = file->f_dentry; inode = dentry->d_inode; - error = -EACCES; + error = -EINVAL; if (!S_ISREG(inode->i_mode) || !(file->f_mode & FMODE_WRITE)) goto out_putf; error = -EPERM; - To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org Please read the FAQ at http://www.tux.org/lkml/
|  |