|
@@ -30,11 +30,13 @@
|
|
|
#define NCP_PACKET_SIZE_INTERNAL 65536
|
|
|
|
|
|
static int
|
|
|
-ncp_get_fs_info(struct ncp_server* server, struct inode* inode, struct ncp_fs_info __user *arg)
|
|
|
+ncp_get_fs_info(struct ncp_server * server, struct file *file,
|
|
|
+ struct ncp_fs_info __user *arg)
|
|
|
{
|
|
|
+ struct inode *inode = file->f_dentry->d_inode;
|
|
|
struct ncp_fs_info info;
|
|
|
|
|
|
- if ((permission(inode, MAY_WRITE, NULL) != 0)
|
|
|
+ if ((file_permission(file, MAY_WRITE) != 0)
|
|
|
&& (current->uid != server->m.mounted_uid)) {
|
|
|
return -EACCES;
|
|
|
}
|
|
@@ -58,11 +60,13 @@ ncp_get_fs_info(struct ncp_server* server, struct inode* inode, struct ncp_fs_in
|
|
|
}
|
|
|
|
|
|
static int
|
|
|
-ncp_get_fs_info_v2(struct ncp_server* server, struct inode* inode, struct ncp_fs_info_v2 __user * arg)
|
|
|
+ncp_get_fs_info_v2(struct ncp_server * server, struct file *file,
|
|
|
+ struct ncp_fs_info_v2 __user * arg)
|
|
|
{
|
|
|
+ struct inode *inode = file->f_dentry->d_inode;
|
|
|
struct ncp_fs_info_v2 info2;
|
|
|
|
|
|
- if ((permission(inode, MAY_WRITE, NULL) != 0)
|
|
|
+ if ((file_permission(file, MAY_WRITE) != 0)
|
|
|
&& (current->uid != server->m.mounted_uid)) {
|
|
|
return -EACCES;
|
|
|
}
|
|
@@ -190,7 +194,7 @@ int ncp_ioctl(struct inode *inode, struct file *filp,
|
|
|
switch (cmd) {
|
|
|
case NCP_IOC_NCPREQUEST:
|
|
|
|
|
|
- if ((permission(inode, MAY_WRITE, NULL) != 0)
|
|
|
+ if ((file_permission(filp, MAY_WRITE) != 0)
|
|
|
&& (current->uid != server->m.mounted_uid)) {
|
|
|
return -EACCES;
|
|
|
}
|
|
@@ -245,16 +249,16 @@ int ncp_ioctl(struct inode *inode, struct file *filp,
|
|
|
return ncp_conn_logged_in(inode->i_sb);
|
|
|
|
|
|
case NCP_IOC_GET_FS_INFO:
|
|
|
- return ncp_get_fs_info(server, inode, argp);
|
|
|
+ return ncp_get_fs_info(server, filp, argp);
|
|
|
|
|
|
case NCP_IOC_GET_FS_INFO_V2:
|
|
|
- return ncp_get_fs_info_v2(server, inode, argp);
|
|
|
+ return ncp_get_fs_info_v2(server, filp, argp);
|
|
|
|
|
|
case NCP_IOC_GETMOUNTUID2:
|
|
|
{
|
|
|
unsigned long tmp = server->m.mounted_uid;
|
|
|
|
|
|
- if ( (permission(inode, MAY_READ, NULL) != 0)
|
|
|
+ if ((file_permission(filp, MAY_READ) != 0)
|
|
|
&& (current->uid != server->m.mounted_uid))
|
|
|
{
|
|
|
return -EACCES;
|
|
@@ -268,7 +272,7 @@ int ncp_ioctl(struct inode *inode, struct file *filp,
|
|
|
{
|
|
|
struct ncp_setroot_ioctl sr;
|
|
|
|
|
|
- if ( (permission(inode, MAY_READ, NULL) != 0)
|
|
|
+ if ((file_permission(filp, MAY_READ) != 0)
|
|
|
&& (current->uid != server->m.mounted_uid))
|
|
|
{
|
|
|
return -EACCES;
|
|
@@ -343,7 +347,7 @@ int ncp_ioctl(struct inode *inode, struct file *filp,
|
|
|
|
|
|
#ifdef CONFIG_NCPFS_PACKET_SIGNING
|
|
|
case NCP_IOC_SIGN_INIT:
|
|
|
- if ((permission(inode, MAY_WRITE, NULL) != 0)
|
|
|
+ if ((file_permission(filp, MAY_WRITE) != 0)
|
|
|
&& (current->uid != server->m.mounted_uid))
|
|
|
{
|
|
|
return -EACCES;
|
|
@@ -366,7 +370,7 @@ int ncp_ioctl(struct inode *inode, struct file *filp,
|
|
|
return 0;
|
|
|
|
|
|
case NCP_IOC_SIGN_WANTED:
|
|
|
- if ( (permission(inode, MAY_READ, NULL) != 0)
|
|
|
+ if ((file_permission(filp, MAY_READ) != 0)
|
|
|
&& (current->uid != server->m.mounted_uid))
|
|
|
{
|
|
|
return -EACCES;
|
|
@@ -379,7 +383,7 @@ int ncp_ioctl(struct inode *inode, struct file *filp,
|
|
|
{
|
|
|
int newstate;
|
|
|
|
|
|
- if ( (permission(inode, MAY_WRITE, NULL) != 0)
|
|
|
+ if ((file_permission(filp, MAY_WRITE) != 0)
|
|
|
&& (current->uid != server->m.mounted_uid))
|
|
|
{
|
|
|
return -EACCES;
|
|
@@ -400,7 +404,7 @@ int ncp_ioctl(struct inode *inode, struct file *filp,
|
|
|
|
|
|
#ifdef CONFIG_NCPFS_IOCTL_LOCKING
|
|
|
case NCP_IOC_LOCKUNLOCK:
|
|
|
- if ( (permission(inode, MAY_WRITE, NULL) != 0)
|
|
|
+ if ((file_permission(filp, MAY_WRITE) != 0)
|
|
|
&& (current->uid != server->m.mounted_uid))
|
|
|
{
|
|
|
return -EACCES;
|
|
@@ -605,7 +609,7 @@ outrel:
|
|
|
#endif /* CONFIG_NCPFS_NLS */
|
|
|
|
|
|
case NCP_IOC_SETDENTRYTTL:
|
|
|
- if ((permission(inode, MAY_WRITE, NULL) != 0) &&
|
|
|
+ if ((file_permission(filp, MAY_WRITE) != 0) &&
|
|
|
(current->uid != server->m.mounted_uid))
|
|
|
return -EACCES;
|
|
|
{
|
|
@@ -635,7 +639,7 @@ outrel:
|
|
|
so we have this out of switch */
|
|
|
if (cmd == NCP_IOC_GETMOUNTUID) {
|
|
|
__kernel_uid_t uid = 0;
|
|
|
- if ((permission(inode, MAY_READ, NULL) != 0)
|
|
|
+ if ((file_permission(filp, MAY_READ) != 0)
|
|
|
&& (current->uid != server->m.mounted_uid)) {
|
|
|
return -EACCES;
|
|
|
}
|