[XFS] Remove unused header files for MAC and CAP checking functionality.
xfs_mac.h and xfs_cap.h provide definitions and macros that aren't used anywhere in XFS at all. They are left-overs from "to be implement at some point in the future" functionality that Irix XFS has. If this functionality ever goes into Linux, it will be provided at a different layer, most likely through the security hooks in the kernel so we will never need this functionality in XFS. Patch provided by Eric Sandeen (sandeen@sandeen.net). SGI-PV: 960895 SGI-Modid: xfs-linux-melb:xfs-kern:28036a Signed-off-by: Eric Sandeen <sandeen@sandeen.net> Signed-off-by: David Chinner <dgc@sgi.com> Signed-off-by: Tim Shimmin <tes@sgi.com>
This commit is contained in:
Eric Sandeen
Tim Shimmin
Родитель
3c0dc77b42
Коммит
7bc5306d74
|
|
@ -41,8 +41,6 @@
|
|||
#include "xfs_error.h"
|
||||
#include "xfs_rw.h"
|
||||
#include "xfs_acl.h"
|
||||
#include "xfs_cap.h"
|
||||
#include "xfs_mac.h"
|
||||
#include "xfs_attr.h"
|
||||
#include "xfs_bmap.h"
|
||||
#include "xfs_buf_item.h"
|
||||
|
|
|
|||
|
|
@ -43,8 +43,6 @@
|
|||
#include "xfs_itable.h"
|
||||
#include "xfs_rw.h"
|
||||
#include "xfs_acl.h"
|
||||
#include "xfs_cap.h"
|
||||
#include "xfs_mac.h"
|
||||
#include "xfs_attr.h"
|
||||
#include "xfs_buf_item.h"
|
||||
#include "xfs_utils.h"
|
||||
|
|
|
|||
|
|
@ -43,8 +43,6 @@
|
|||
#include "xfs_itable.h"
|
||||
#include "xfs_rw.h"
|
||||
#include "xfs_acl.h"
|
||||
#include "xfs_cap.h"
|
||||
#include "xfs_mac.h"
|
||||
#include "xfs_attr.h"
|
||||
#include "xfs_inode_item.h"
|
||||
#include "xfs_buf_item.h"
|
||||
|
|
|
|||
|
|
@ -43,8 +43,6 @@
|
|||
#include "xfs_itable.h"
|
||||
#include "xfs_rw.h"
|
||||
#include "xfs_acl.h"
|
||||
#include "xfs_cap.h"
|
||||
#include "xfs_mac.h"
|
||||
#include "xfs_attr.h"
|
||||
#include "xfs_buf_item.h"
|
||||
#include "xfs_utils.h"
|
||||
|
|
|
|||
|
|
@ -43,8 +43,6 @@
|
|||
#include "xfs_itable.h"
|
||||
#include "xfs_rw.h"
|
||||
#include "xfs_acl.h"
|
||||
#include "xfs_cap.h"
|
||||
#include "xfs_mac.h"
|
||||
#include "xfs_attr.h"
|
||||
#include "xfs_buf_item.h"
|
||||
#include "xfs_trans_space.h"
|
||||
|
|
|
|||
|
|
@ -43,8 +43,6 @@
|
|||
#include "xfs_itable.h"
|
||||
#include "xfs_rw.h"
|
||||
#include "xfs_acl.h"
|
||||
#include "xfs_cap.h"
|
||||
#include "xfs_mac.h"
|
||||
#include "xfs_attr.h"
|
||||
#include "xfs_buf_item.h"
|
||||
#include "xfs_trans_priv.h"
|
||||
|
|
|
|||
|
|
@ -44,8 +44,6 @@
|
|||
#include "xfs_bmap.h"
|
||||
#include "xfs_rw.h"
|
||||
#include "xfs_acl.h"
|
||||
#include "xfs_cap.h"
|
||||
#include "xfs_mac.h"
|
||||
#include "xfs_attr.h"
|
||||
#include "xfs_buf_item.h"
|
||||
#include "xfs_trans_space.h"
|
||||
|
|
|
|||
|
|
@ -44,8 +44,6 @@
|
|||
#include "xfs_error.h"
|
||||
#include "xfs_rw.h"
|
||||
#include "xfs_acl.h"
|
||||
#include "xfs_cap.h"
|
||||
#include "xfs_mac.h"
|
||||
#include "xfs_attr.h"
|
||||
#include "xfs_buf_item.h"
|
||||
#include "xfs_qm.h"
|
||||
|
|
|
|||
|
|
@ -43,8 +43,6 @@
|
|||
#include "xfs_error.h"
|
||||
#include "xfs_rw.h"
|
||||
#include "xfs_acl.h"
|
||||
#include "xfs_cap.h"
|
||||
#include "xfs_mac.h"
|
||||
#include "xfs_attr.h"
|
||||
#include "xfs_buf_item.h"
|
||||
#include "xfs_qm.h"
|
||||
|
|
|
|||
|
|
@ -46,8 +46,6 @@
|
|||
#include "xfs_error.h"
|
||||
#include "xfs_rw.h"
|
||||
#include "xfs_acl.h"
|
||||
#include "xfs_cap.h"
|
||||
#include "xfs_mac.h"
|
||||
#include "xfs_attr.h"
|
||||
#include "xfs_buf_item.h"
|
||||
#include "xfs_utils.h"
|
||||
|
|
|
|||
|
|
@ -43,8 +43,6 @@
|
|||
#include "xfs_error.h"
|
||||
#include "xfs_rw.h"
|
||||
#include "xfs_acl.h"
|
||||
#include "xfs_cap.h"
|
||||
#include "xfs_mac.h"
|
||||
#include "xfs_attr.h"
|
||||
#include "xfs_buf_item.h"
|
||||
#include "xfs_trans_priv.h"
|
||||
|
|
|
|||
|
|
@ -31,7 +31,6 @@
|
|||
#include "xfs_inode.h"
|
||||
#include "xfs_btree.h"
|
||||
#include "xfs_acl.h"
|
||||
#include "xfs_mac.h"
|
||||
#include "xfs_attr.h"
|
||||
|
||||
#include <linux/capability.h>
|
||||
|
|
|
|||
|
|
@ -1,70 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2000-2002,2005 Silicon Graphics, Inc.
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it would be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
#ifndef __XFS_CAP_H__
|
||||
#define __XFS_CAP_H__
|
||||
|
||||
/*
|
||||
* Capabilities
|
||||
*/
|
||||
typedef __uint64_t xfs_cap_value_t;
|
||||
|
||||
typedef struct xfs_cap_set {
|
||||
xfs_cap_value_t cap_effective; /* use in capability checks */
|
||||
xfs_cap_value_t cap_permitted; /* combined with file attrs */
|
||||
xfs_cap_value_t cap_inheritable;/* pass through exec */
|
||||
} xfs_cap_set_t;
|
||||
|
||||
/* On-disk XFS extended attribute names */
|
||||
#define SGI_CAP_FILE "SGI_CAP_FILE"
|
||||
#define SGI_CAP_FILE_SIZE (sizeof(SGI_CAP_FILE)-1)
|
||||
#define SGI_CAP_LINUX "SGI_CAP_LINUX"
|
||||
#define SGI_CAP_LINUX_SIZE (sizeof(SGI_CAP_LINUX)-1)
|
||||
|
||||
/*
|
||||
* For Linux, we take the bitfields directly from capability.h
|
||||
* and no longer attempt to keep this attribute ondisk compatible
|
||||
* with IRIX. Since this attribute is only set on executables,
|
||||
* it just doesn't make much sense to try. We do use a different
|
||||
* named attribute though, to avoid confusion.
|
||||
*/
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#ifdef CONFIG_FS_POSIX_CAP
|
||||
|
||||
#include <linux/posix_cap_xattr.h>
|
||||
|
||||
struct bhv_vnode;
|
||||
|
||||
extern int xfs_cap_vhascap(struct bhv_vnode *);
|
||||
extern int xfs_cap_vset(struct bhv_vnode *, void *, size_t);
|
||||
extern int xfs_cap_vget(struct bhv_vnode *, void *, size_t);
|
||||
extern int xfs_cap_vremove(struct bhv_vnode *);
|
||||
|
||||
#define _CAP_EXISTS xfs_cap_vhascap
|
||||
|
||||
#else
|
||||
#define xfs_cap_vset(v,p,sz) (-EOPNOTSUPP)
|
||||
#define xfs_cap_vget(v,p,sz) (-EOPNOTSUPP)
|
||||
#define xfs_cap_vremove(v) (-EOPNOTSUPP)
|
||||
#define _CAP_EXISTS (NULL)
|
||||
#endif
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#endif /* __XFS_CAP_H__ */
|
||||
|
|
@ -41,7 +41,6 @@
|
|||
#include "xfs_itable.h"
|
||||
#include "xfs_dfrag.h"
|
||||
#include "xfs_error.h"
|
||||
#include "xfs_mac.h"
|
||||
#include "xfs_rw.h"
|
||||
|
||||
/*
|
||||
|
|
|
|||
|
|
@ -47,7 +47,6 @@
|
|||
#include "xfs_utils.h"
|
||||
#include "xfs_dir2_trace.h"
|
||||
#include "xfs_quota.h"
|
||||
#include "xfs_mac.h"
|
||||
#include "xfs_acl.h"
|
||||
|
||||
|
||||
|
|
|
|||
|
|
@ -43,8 +43,6 @@
|
|||
#include "xfs_itable.h"
|
||||
#include "xfs_rw.h"
|
||||
#include "xfs_acl.h"
|
||||
#include "xfs_cap.h"
|
||||
#include "xfs_mac.h"
|
||||
#include "xfs_attr.h"
|
||||
#include "xfs_buf_item.h"
|
||||
#include "xfs_trans_space.h"
|
||||
|
|
|
|||
106
fs/xfs/xfs_mac.h
106
fs/xfs/xfs_mac.h
|
|
@ -1,106 +0,0 @@
|
|||
/*
|
||||
* Copyright (c) 2001-2002,2005 Silicon Graphics, Inc.
|
||||
* All Rights Reserved.
|
||||
*
|
||||
* This program is free software; you can redistribute it and/or
|
||||
* modify it under the terms of the GNU General Public License as
|
||||
* published by the Free Software Foundation.
|
||||
*
|
||||
* This program is distributed in the hope that it would be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU General Public License
|
||||
* along with this program; if not, write the Free Software Foundation,
|
||||
* Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
|
||||
*/
|
||||
#ifndef __XFS_MAC_H__
|
||||
#define __XFS_MAC_H__
|
||||
|
||||
/*
|
||||
* Mandatory Access Control
|
||||
*
|
||||
* Layout of a composite MAC label:
|
||||
* ml_list contains the list of categories (MSEN) followed by the list of
|
||||
* divisions (MINT). This is actually a header for the data structure which
|
||||
* will have an ml_list with more than one element.
|
||||
*
|
||||
* -------------------------------
|
||||
* | ml_msen_type | ml_mint_type |
|
||||
* -------------------------------
|
||||
* | ml_level | ml_grade |
|
||||
* -------------------------------
|
||||
* | ml_catcount |
|
||||
* -------------------------------
|
||||
* | ml_divcount |
|
||||
* -------------------------------
|
||||
* | category 1 |
|
||||
* | . . . |
|
||||
* | category N | (where N = ml_catcount)
|
||||
* -------------------------------
|
||||
* | division 1 |
|
||||
* | . . . |
|
||||
* | division M | (where M = ml_divcount)
|
||||
* -------------------------------
|
||||
*/
|
||||
#define XFS_MAC_MAX_SETS 250
|
||||
typedef struct xfs_mac_label {
|
||||
__uint8_t ml_msen_type; /* MSEN label type */
|
||||
__uint8_t ml_mint_type; /* MINT label type */
|
||||
__uint8_t ml_level; /* Hierarchical level */
|
||||
__uint8_t ml_grade; /* Hierarchical grade */
|
||||
__uint16_t ml_catcount; /* Category count */
|
||||
__uint16_t ml_divcount; /* Division count */
|
||||
/* Category set, then Division set */
|
||||
__uint16_t ml_list[XFS_MAC_MAX_SETS];
|
||||
} xfs_mac_label_t;
|
||||
|
||||
/* MSEN label type names. Choose an upper case ASCII character. */
|
||||
#define XFS_MSEN_ADMIN_LABEL 'A' /* Admin: low<admin != tcsec<high */
|
||||
#define XFS_MSEN_EQUAL_LABEL 'E' /* Wildcard - always equal */
|
||||
#define XFS_MSEN_HIGH_LABEL 'H' /* System High - always dominates */
|
||||
#define XFS_MSEN_MLD_HIGH_LABEL 'I' /* System High, multi-level dir */
|
||||
#define XFS_MSEN_LOW_LABEL 'L' /* System Low - always dominated */
|
||||
#define XFS_MSEN_MLD_LABEL 'M' /* TCSEC label on a multi-level dir */
|
||||
#define XFS_MSEN_MLD_LOW_LABEL 'N' /* System Low, multi-level dir */
|
||||
#define XFS_MSEN_TCSEC_LABEL 'T' /* TCSEC label */
|
||||
#define XFS_MSEN_UNKNOWN_LABEL 'U' /* unknown label */
|
||||
|
||||
/* MINT label type names. Choose a lower case ASCII character. */
|
||||
#define XFS_MINT_BIBA_LABEL 'b' /* Dual of a TCSEC label */
|
||||
#define XFS_MINT_EQUAL_LABEL 'e' /* Wildcard - always equal */
|
||||
#define XFS_MINT_HIGH_LABEL 'h' /* High Grade - always dominates */
|
||||
#define XFS_MINT_LOW_LABEL 'l' /* Low Grade - always dominated */
|
||||
|
||||
/* On-disk XFS extended attribute names */
|
||||
#define SGI_MAC_FILE "SGI_MAC_FILE"
|
||||
#define SGI_MAC_FILE_SIZE (sizeof(SGI_MAC_FILE)-1)
|
||||
|
||||
|
||||
#ifdef __KERNEL__
|
||||
|
||||
#ifdef CONFIG_FS_POSIX_MAC
|
||||
|
||||
/* NOT YET IMPLEMENTED */
|
||||
|
||||
#define MACEXEC 00100
|
||||
#define MACWRITE 00200
|
||||
#define MACREAD 00400
|
||||
|
||||
struct xfs_inode;
|
||||
extern int xfs_mac_iaccess(struct xfs_inode *, mode_t, cred_t *);
|
||||
|
||||
#define _MAC_XFS_IACCESS(i,m,c) (xfs_mac_iaccess(i,m,c))
|
||||
#define _MAC_VACCESS(v,c,m) (xfs_mac_vaccess(v,c,m))
|
||||
#define _MAC_EXISTS xfs_mac_vhaslabel
|
||||
|
||||
#else
|
||||
#define _MAC_XFS_IACCESS(i,m,c) (0)
|
||||
#define _MAC_VACCESS(v,c,m) (0)
|
||||
#define _MAC_EXISTS (NULL)
|
||||
#endif
|
||||
|
||||
#endif /* __KERNEL__ */
|
||||
|
||||
#endif /* __XFS_MAC_H__ */
|
||||
|
|
@ -42,7 +42,6 @@
|
|||
#include "xfs_attr.h"
|
||||
#include "xfs_bmap.h"
|
||||
#include "xfs_acl.h"
|
||||
#include "xfs_mac.h"
|
||||
#include "xfs_error.h"
|
||||
#include "xfs_buf_item.h"
|
||||
#include "xfs_rw.h"
|
||||
|
|
|
|||
|
|
@ -51,7 +51,6 @@
|
|||
#include "xfs_refcache.h"
|
||||
#include "xfs_trans_space.h"
|
||||
#include "xfs_log_priv.h"
|
||||
#include "xfs_mac.h"
|
||||
|
||||
STATIC int
|
||||
xfs_open(
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче