Attachment #205356 for bug #255556

View | Details | Raw Unified | Return to bug 255556
Collapse All | Expand All

Lines 19-26 Link Here

(-)src/kernel/linux-2.6/pvfs2-utils.c.orig (-3 / +3 lines)
19	if (credentials)	19	if (credentials)
20	{	20	{
21	memset(credentials, 0, sizeof(PVFS_credentials));	21	memset(credentials, 0, sizeof(PVFS_credentials));
22	credentials->uid = current->fsuid;	22	credentials->uid = current_fsuid();
23	credentials->gid = current->fsgid;	23	credentials->gid = current_fsgid();
24		24
25	ret = 0;	25	ret = 0;
26	}	26	}
Lines 731-737 Link Here
731	if (inode)	731	if (inode)
732	{	732	{
733	gossip_debug(GOSSIP_XATTR_DEBUG, "getxattr on inode %llu, name %s (uid %o, gid %o)\n",	733	gossip_debug(GOSSIP_XATTR_DEBUG, "getxattr on inode %llu, name %s (uid %o, gid %o)\n",
734	llu(get_handle_from_ino(inode)), name, current->fsuid, current->fsgid);	734	llu(get_handle_from_ino(inode)), name, current_fsuid(), current_fsgid());
735	pvfs2_inode = PVFS2_I(inode);	735	pvfs2_inode = PVFS2_I(inode);
736	/* obtain the xattr semaphore */	736	/* obtain the xattr semaphore */
737	down_read(&pvfs2_inode->xattr_sem);	737	down_read(&pvfs2_inode->xattr_sem);




        return -EOPNOTSUPP;
    }
    /* Are we capable of setting acls on a file for which we should not be? */
    if ((current_fsuid() != inode->i_uid) && !capable(CAP_FOWNER))
    {
        gossip_err("pvfs2_xattr_set_acl: operation not permitted "
                "(current_fsuid %d), (inode->owner %d)\n", 
                current_fsuid(), inode->i_uid);
        return -EPERM;
    }
    if (value) 

    if (ret != 0)
    {
        gossip_debug(GOSSIP_ACL_DEBUG, "pvfs2_permission failed: inode: %llu mask = %o"
                "mode = %o current_fsuid = %d "
                "inode->i_uid = %d, inode->i_gid = %d "
                "in_group_p = %d "
                "(ret = %d)\n",
                llu(get_handle_from_ino(inode)), mask, inode->i_mode, current_fsuid(), 
                inode->i_uid, inode->i_gid, 
                in_group_p(inode->i_gid),
                ret);

    int error;

    gossip_debug(GOSSIP_ACL_DEBUG, "pvfs2_permission: inode: %llu mask = %o"
            "mode = %o current_fsuid = %d "
            "inode->i_uid = %d, inode->i_gid = %d"
            "in_group_p = %d\n", 
            llu(get_handle_from_ino(inode)), mask, mode, current_fsuid(),
            inode->i_uid, inode->i_gid,
            in_group_p(inode->i_gid));


        gossip_err("pvfs2_permission: cannot write to an immutable file!\n");
        return -EACCES;
    }
  if (current_fsuid() == inode->i_uid) 
    {
        mode >>= 6;
    }

Lines 532-539 Link Here

(-)src/kernel/linux-2.6/inode.c.orig (-2 / +2 lines)
532	"pvfs2_get_custom_inode_common: inode: %p, inode->i_mode %o\n",	532	"pvfs2_get_custom_inode_common: inode: %p, inode->i_mode %o\n",
533	inode, inode->i_mode);	533	inode, inode->i_mode);
534	inode->i_mapping->host = inode;	534	inode->i_mapping->host = inode;
535	inode->i_uid = current->fsuid;	535	inode->i_uid = current_fsuid();
536	inode->i_gid = current->fsgid;	536	inode->i_gid = current_fsgid();
537	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;	537	inode->i_atime = inode->i_mtime = inode->i_ctime = CURRENT_TIME;
538	inode->i_size = PAGE_CACHE_SIZE;	538	inode->i_size = PAGE_CACHE_SIZE;
539	#ifdef HAVE_I_BLKSIZE_IN_STRUCT_INODE	539	#ifdef HAVE_I_BLKSIZE_IN_STRUCT_INODE




#define fill_default_sys_attrs(sys_attr,type,mode)\
do                                                \
{                                                 \
    sys_attr.owner = current_fsuid();             \
    sys_attr.group = current_fsgid();             \
    sys_attr.size = 0;                            \
    sys_attr.perms = PVFS_util_translate_mode(mode,0); \
    sys_attr.objtype = type;                      \

#define fill_default_sys_attrs(sys_attr,type,mode)\
do                                                \
{                                                 \
    sys_attr.owner = current_fsuid();             \
    sys_attr.group = current_fsgid();             \
    sys_attr.size = 0;                            \
    sys_attr.perms = PVFS_util_translate_mode(mode,0); \
    sys_attr.objtype = type;                      \

Lines 20-25 Link Here

(-)src/kernel/linux-2.6/acl.c.orig (+1 lines)
20	#if !defined(PVFS2_LINUX_KERNEL_2_4) && defined(HAVE_GENERIC_GETXATTR) && defined(CONFIG_FS_POSIX_ACL)	20	#if !defined(PVFS2_LINUX_KERNEL_2_4) && defined(HAVE_GENERIC_GETXATTR) && defined(CONFIG_FS_POSIX_ACL)
21	#include "pvfs2-internal.h"	21	#include "pvfs2-internal.h"
22		22
		23	#include <linux/fs_struct.h>
23	#ifdef HAVE_POSIX_ACL_H	24	#ifdef HAVE_POSIX_ACL_H
24	#include <linux/posix_acl.h>	25	#include <linux/posix_acl.h>
25	#endif	26	#endif

Return to bug 255556

Lines 420-430 Link Here

(-)src/kernel/linux-2.6/acl.c.orig (-8 / +8 lines)
420	return -EOPNOTSUPP;	420	return -EOPNOTSUPP;
421	}	421	}
422	/* Are we capable of setting acls on a file for which we should not be? */	422	/* Are we capable of setting acls on a file for which we should not be? */
423	if ((current->fsuid != inode->i_uid) && !capable(CAP_FOWNER))	423	if ((current_fsuid() != inode->i_uid) && !capable(CAP_FOWNER))
424	{	424	{
425	gossip_err("pvfs2_xattr_set_acl: operation not permitted "	425	gossip_err("pvfs2_xattr_set_acl: operation not permitted "
426	"(current->fsuid %d), (inode->owner %d)\n",	426	"(current_fsuid %d), (inode->owner %d)\n",
427	current->fsuid, inode->i_uid);	427	current_fsuid(), inode->i_uid);
428	return -EPERM;	428	return -EPERM;
429	}	429	}
430	if (value)	430	if (value)
Lines 680-690 Link Here
680	if (ret != 0)	680	if (ret != 0)
681	{	681	{
682	gossip_debug(GOSSIP_ACL_DEBUG, "pvfs2_permission failed: inode: %llu mask = %o"	682	gossip_debug(GOSSIP_ACL_DEBUG, "pvfs2_permission failed: inode: %llu mask = %o"
683	"mode = %o current->fsuid = %d "	683	"mode = %o current_fsuid = %d "
684	"inode->i_uid = %d, inode->i_gid = %d "	684	"inode->i_uid = %d, inode->i_gid = %d "
685	"in_group_p = %d "	685	"in_group_p = %d "
686	"(ret = %d)\n",	686	"(ret = %d)\n",
687	llu(get_handle_from_ino(inode)), mask, inode->i_mode, current->fsuid,	687	llu(get_handle_from_ino(inode)), mask, inode->i_mode, current_fsuid(),
688	inode->i_uid, inode->i_gid,	688	inode->i_uid, inode->i_gid,
689	in_group_p(inode->i_gid),	689	in_group_p(inode->i_gid),
690	ret);	690	ret);
Lines 706-715 Link Here
706	int error;	706	int error;
707		707
708	gossip_debug(GOSSIP_ACL_DEBUG, "pvfs2_permission: inode: %llu mask = %o"	708	gossip_debug(GOSSIP_ACL_DEBUG, "pvfs2_permission: inode: %llu mask = %o"
709	"mode = %o current->fsuid = %d "	709	"mode = %o current_fsuid = %d "
710	"inode->i_uid = %d, inode->i_gid = %d"	710	"inode->i_uid = %d, inode->i_gid = %d"
711	"in_group_p = %d\n",	711	"in_group_p = %d\n",
712	llu(get_handle_from_ino(inode)), mask, mode, current->fsuid,	712	llu(get_handle_from_ino(inode)), mask, mode, current_fsuid(),
713	inode->i_uid, inode->i_gid,	713	inode->i_uid, inode->i_gid,
714	in_group_p(inode->i_gid));	714	in_group_p(inode->i_gid));
715		715
Lines 727-733 Link Here
727	gossip_err("pvfs2_permission: cannot write to an immutable file!\n");	727	gossip_err("pvfs2_permission: cannot write to an immutable file!\n");
728	return -EACCES;	728	return -EACCES;
729	}	729	}
730	if (current->fsuid == inode->i_uid)	730	if (current_fsuid() == inode->i_uid)
731	{	731	{
732	mode >>= 6;	732	mode >>= 6;
733	}	733	}

Lines 1137-1144 Link Here

(-)src/kernel/linux-2.6/pvfs2-kernel.h.orig (-4 / +4 lines)
1137	#define fill_default_sys_attrs(sys_attr,type,mode)\	1137	#define fill_default_sys_attrs(sys_attr,type,mode)\
1138	do \	1138	do \
1139	{ \	1139	{ \
1140	sys_attr.owner = current->fsuid; \	1140	sys_attr.owner = current_fsuid(); \
1141	sys_attr.group = current->fsgid; \	1141	sys_attr.group = current_fsgid(); \
1142	sys_attr.size = 0; \	1142	sys_attr.size = 0; \
1143	sys_attr.perms = PVFS_util_translate_mode(mode,0); \	1143	sys_attr.perms = PVFS_util_translate_mode(mode,0); \
1144	sys_attr.objtype = type; \	1144	sys_attr.objtype = type; \
Lines 1165-1172 Link Here
1165	#define fill_default_sys_attrs(sys_attr,type,mode)\	1165	#define fill_default_sys_attrs(sys_attr,type,mode)\
1166	do \	1166	do \
1167	{ \	1167	{ \
1168	sys_attr.owner = current->fsuid; \	1168	sys_attr.owner = current_fsuid(); \
1169	sys_attr.group = current->fsgid; \	1169	sys_attr.group = current_fsgid(); \
1170	sys_attr.size = 0; \	1170	sys_attr.size = 0; \
1171	sys_attr.perms = PVFS_util_translate_mode(mode,0); \	1171	sys_attr.perms = PVFS_util_translate_mode(mode,0); \
1172	sys_attr.objtype = type; \	1172	sys_attr.objtype = type; \