From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933811AbdKBO4R (ORCPT ); Thu, 2 Nov 2017 10:56:17 -0400 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:50482 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933719AbdKBOzl (ORCPT ); Thu, 2 Nov 2017 10:55:41 -0400 From: Roman Gushchin To: CC: Tejun Heo , Alexei Starovoitov , Daniel Borkmann , , , Roman Gushchin , "David S . Miller" Subject: [PATCH v2 net-next 1/5] device_cgroup: add DEVCG_ prefix to ACC_* and DEV_* constants Date: Thu, 2 Nov 2017 10:54:36 -0400 Message-ID: <20171102145440.12986-2-guro@fb.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171102145440.12986-1-guro@fb.com> References: <20171102145440.12986-1-guro@fb.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [2620:10d:c091:200::a050] X-ClientProxiedBy: BN6PR20CA0057.namprd20.prod.outlook.com (2603:10b6:404:151::19) To CO1PR15MB1077.namprd15.prod.outlook.com (2a01:111:e400:7b66::7) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 69003ccd-919b-49cb-45be-08d52201bc8c X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199);SRVR:CO1PR15MB1077; X-Microsoft-Exchange-Diagnostics: 1;CO1PR15MB1077;3:00XLmvUv1MtOzAIS7JutACSxJPdSdl23/uWKXeEDltMCWNt+SNEdsGuF/IqlgjT4K/KLg0MSaF2KuTGB8LQnReKuAMzxqhVpnNsu4aHyukCWUwgHW5jMcUEdeljMAuSWhuqgUlIIMoFnGkqbHRzaHYIJEgcafJI7TmI8MWXbYoc9BXOPi7J66m6eMkWcRvIObuBQenuw6UHYY2LJusLMBiBFs0Wx6uAPk/F2EvTqS3bUf/CQYZkbxHAHk+jpUOmy;25:1SABeCGF+GthgzdQldgexZ3ypRndsHFjd28HygqIyWTn479kwxyjbBn2gRkxkqTnZ5p4IFITvp3oRTu3SY4r1ZmV/wesdcIhZmDTSfgJdKRG/NcXPhpip9Vfe9nI2I1YSlUVfaipujkGUdzFN5Qrys6l5qySO9fCj40msuNYlHbaGuP/wyR/tFL2zL0Iw/XTTL1KzmsfoHbcH5HLp3lX/KYb+H9tg6h/AKrq0Q/xEnjBhdoTjSptc7E6GwWZq4RGlssjZ49IwizEAbgkf6t0Pv8512CFTXtq06fLdWN+royi0/mC0WUmz/Z8sfLL9wG2EljC0MLCyBXN82RY9ICf1A==;31:J6lSy4YAJPlfvSJQb94BvHK+GKoR/v39dVsf9XP3Ex96DGLGVvgedQQ76RpZZ5vfxlWo8F8u2mlQ8hmIUFwwqaU/HK20RwmyFIpx7i//QWvP13e6VnkUv/8LFmi0d/nuFrCap7cYaRUv7zbiTEq8CNaIJ8d9q9p3LhzxbEIBIoWLKKzF/Fy6PhsHh7NFa7Coek8Mvoqlqn9VZEhYm1Sj/UN3o/8hIp2oTSxvN+xIpHU= X-MS-TrafficTypeDiagnostic: CO1PR15MB1077: X-Microsoft-Exchange-Diagnostics: 1;CO1PR15MB1077;20:4cIsnnXuYul08q3HjUaL+9aAeBnU62gHk4eJ4zYvopDTFrPUDIeOUbPqxtBKa/NuzVVySYb9vzamgKai0khI8cYbpwGEchNgn97fTMY/vFF6m9z8O3ovrUKuALfHIXDckK/aAypSvLhWt0hXbKoUFJDUndylXTzfg2qts9h8m7hnxqIXQkKLLblGZT+iA8MvahvtKkR0XXxaxcYuEFk7GTfFDdwUxh3l7t/VNfJXsr9hma3GgzPSvAfOUwaYFgJG9+NC7PZq2iLCEAId/4mTlcODJqCOlCFcYPBOEM/Fm/idDuBmDA3dy366ouEMpnoEP3HKNEEYCKK7HuwggKRBAz+AICWNfyNLdm4TQUWH82D7ytXdbDJDVIc5EY2AS0X7k4n7mPYgA6/Y1zRApR+lEGzIpcEea56l+3HcO9e1c5povARBACnhAdvf8siaq7lPh0Gm0UoEOl9kOsVcFpE+4/flMv+eSNRRqTsMo1/lEFb9269ADRnVMgszc650baHk;4:UXizW7wKME8oDkdg3W98P6Twa9OVZQUjOvGCQ/2z985xjRLmCsy9zmDB3tUV12rZiZVpVXXLqyx00uhFeFHEHowh200ozZkLy89bo8TcGAS0at/MgxYr/88s+T2Gh5f0pQqvqcwdw1wVxwJdl3H3JtVJI1Tm9WQUg0FARCe/Z65TTcIDHcrwiWNHRtpeNL2Y8Ck3PxVLMqwh990CnMGQ0OBj7afhUG6ClFjCVRv1GCS9tmE9xJySVENijw3kP13xWw6E3eSgDu/mYODuX9TvOkNHCZV+3jky2fQqbpP13AiS7FsBqmnb3qPBpFUC9ZFMsy11R4azJI6AdFJKnrabuX8IllUCw4AE7cXxW7epmUM= X-Exchange-Antispam-Report-Test: UriScan:(192374486261705)(67672495146484); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(11241501159)(6040450)(2401047)(5005006)(8121501046)(3231020)(93006095)(93001095)(3002001)(10201501046)(100000703101)(100105400095)(6041248)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123558100)(20161123555025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:CO1PR15MB1077;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:CO1PR15MB1077; X-Forefront-PRVS: 047999FF16 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(346002)(376002)(199003)(189002)(81156014)(50466002)(189998001)(48376002)(76176999)(50986999)(25786009)(4326008)(2361001)(36756003)(7736002)(5660300001)(2351001)(1076002)(8676002)(101416001)(68736007)(97736004)(33646002)(2906002)(81166006)(6666003)(6116002)(105586002)(106356001)(316002)(5003940100001)(8936002)(478600001)(54906003)(53936002)(305945005)(16586007)(2950100002)(6916009)(6486002)(47776003)(53416004)(69596002)(575784001)(86362001)(6506006)(50226002)(6512007)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:CO1PR15MB1077;H:castle.thefacebook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;CO1PR15MB1077;23:Dai/QWfKR+rxSAKosWi14PTFK7I4d+3LpUDgdvcQY?= =?us-ascii?Q?8eRG8HgoXpuo1KGtV7OE7m8oL4YjQt8xbZSZ3gidKpjm+fXkKqqFIGyKpEdF?= =?us-ascii?Q?vWrDDTN5JDzrqQzc2UjdJsMzz2kdjQXKB1K886y3BCJaVNrJEjEpKxnOv+50?= =?us-ascii?Q?piO8hcVQ1/6GwJqry1ea9Wh977unyAZvKFL+Shze43LuLeLhQVg7OzlM9IRF?= =?us-ascii?Q?9u04U+hbGv1dNIyezG01Ndb3YmubyRVuC7wEdgEDxEtQfPMLVQk9F1KEJmOR?= =?us-ascii?Q?Z/WY1yrSJbCM54xijvnqR6Pppue9HvMFdfS2E15zbVLOakWF9yAhexciGNvb?= =?us-ascii?Q?27x2CmqvnqpbUd1c0bquGJ/1womz/z4N6ZlaMLJl8Ect+0qDw6Ba70At9PGh?= =?us-ascii?Q?54WYJdzXe2exsExQgBPHZIW6oRQmVGP2aiSEucsWUTtRvKuFicuy0Z8rM9fh?= =?us-ascii?Q?zR0aFUCZMuRXMwE6thJG5mHOFkL/KC147xiymd7wRtHrsANEf6pWYKg8YdJx?= =?us-ascii?Q?e056KBuYsSTftazbXscUNc/cIzD983DWqn33xCGFFnPbzfepPp98f2F1DZT+?= =?us-ascii?Q?w4p5s50Kaod/mfzzh7K61bFi94g9/YVB+W/PVCtC5RhPvgFicixj9miUmJAN?= =?us-ascii?Q?2OAEiI6LL784H6M+E5eYrCof17SjfH1IH5PtP0U2SbexOGhX2XLJShdHtBx5?= =?us-ascii?Q?xSakrZ/10ZOr2pGc2wKm4usWZvQUQUQWxN5dWqTn3N9q9SnKN/LsI+qeTPEL?= =?us-ascii?Q?QykoU5vxmkW8vX+WovcCBU+wprx/JLg3EMG0nCorbNveSGy/pI5JjAQCw7bH?= =?us-ascii?Q?i1y/OPTpJG9XMES3x5MpnhZg+aRw6fo92BGlnsVC0bxD3KYAvwmSHxM5I1ZM?= =?us-ascii?Q?XBkAuRG0q6M5f9NjJBosnWWNzeQbMnuy4YhhccFD7Y3x3SwX4RusgvbJZZHb?= =?us-ascii?Q?Va/drOiN4sTC3mr3q4TDASxV3c4AiMDzFnM5CCK/mQwKCLrCriqDHqEUbaQ4?= =?us-ascii?Q?gPnRopsxQe8q7QtvqnzUdL+agKJ3mnGx5fK5c/kMQWypPEXb5kp9yxkKU10A?= =?us-ascii?Q?EJ9JePHC+oR22wVx+aGFtiUb2h5vuZgCBB1eqDNN/uHANpy95wcy0tR0U7Jv?= =?us-ascii?Q?H5qbNmwEL7bn39vXOGYrv/cdabBiLbLB4GbQFqTo6Kl61LkCRGlrw=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;CO1PR15MB1077;6:OdwUalkPm5qoRjUVFh/jJTGXC5P5siGGEbYBX5252TSs2mWdzUhw5DKkorsvVikEUGPhhn4Sfc1Dok1NrXyQtzBMsZie/a0EHC2vzQTLtj5A+E7jjzuHhKwPvzVuoBQteSbRznYk0X7Fh8AHBQlJ/A4OtTwe4zW8KJqlxGEmjOTVxPdR6vQXlcnO3hfad5lsSzTtBgK2/xwfKSslB6/1Go0tw/P/1z8Ou2FxmC/fM8ZbIRtiarxo4cdFC+GI8X7idwxiOuMqlTcTQJGTcc3uzHAbcgbbNmfDpw8FpSVtrORBFGeT6OKZR/O8JM+bYkcQtnDcp9HDE1VVv906kjBn8HZAx/jjpMXc71kduY1OazI=;5:gCqXNi2Pf9HVbzsS32c05rfs1rArVpdENJSKQ3X8JfmwJDnkPcl+tIorDA1JIKDRxCExEwzvLl5lnwHj1H8UO1eY+onfykkuUoGY25SwT1XRbwSaXI5+ELOHADlHXSCTv8o+qNAWznDzHuCzXt67JiGmJ6kMWM4bAbKT6XmmfXM=;24:j4NPHP3BeyJ6i7XPMtlUnoGvimxebAuI5QI0Ef/uCb/R/KphIzaXQUzTNioPqzMAraET+uxB7Gvk96OErUcds7J7D1knasHx6t37IbBEuYA=;7:lTVF7ykD2+z4L1mkKgajhE0IAhz52GTsEKIHw4jbnWT308RHM53E9jWbatVESwp5zcoQExSmHFOfDDELajeVrhE1OjGA9hfzXgFIIu9nsqxgZU3kCpbi5memtvPnHT/kacF4YwmbgkpUkmqaScLdZ4tUTuLIe6sZtOcwd8GWj/FTCGCh91zoV9JwcV9jn5n4iECQbcdkoQJj8r9ModpfgGkiWYZxfLt3wMoeonQiRavcm83Fcts9P/1VyK64udz+ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;CO1PR15MB1077;20:2WfMtpIUipveABZ91vRZhuMmYaLmAhI6V8tQAXrQ8Sy/VXGPSLRMDPuv2ltkn3Lef6/OtL1lz828RCRXKypRYx8Fe20Z92H1AfE41ns/4p+yjapt9FQvpSbhnt3R/dW7DIgVw/HJcAOPi8FcwqZe0UotVnLGyNAVWXV0Edw0pvI= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2017 14:55:18.0632 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 69003ccd-919b-49cb-45be-08d52201bc8c X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CO1PR15MB1077 X-OriginatorOrg: fb.com X-Proofpoint-Spam-Reason: safe X-FB-Internal: Safe X-Proofpoint-Virus-Version: vendor=fsecure engine=2.50.10432:,, definitions=2017-11-02_05:,, signatures=0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Rename device type and access type constants defined in security/device_cgroup.c by adding the DEVCG_ prefix. The reason behind this renaming is to make them global namespace friendly, as they will be moved to the corresponding header file by following patches. Signed-off-by: Roman Gushchin Cc: David S. Miller Cc: Tejun Heo Cc: Alexei Starovoitov Cc: Daniel Borkmann --- security/device_cgroup.c | 72 ++++++++++++++++++++++++------------------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/security/device_cgroup.c b/security/device_cgroup.c index 03c1652c9a1f..76cc0cbbb10d 100644 --- a/security/device_cgroup.c +++ b/security/device_cgroup.c @@ -14,14 +14,14 @@ #include #include -#define ACC_MKNOD 1 -#define ACC_READ 2 -#define ACC_WRITE 4 -#define ACC_MASK (ACC_MKNOD | ACC_READ | ACC_WRITE) +#define DEVCG_ACC_MKNOD 1 +#define DEVCG_ACC_READ 2 +#define DEVCG_ACC_WRITE 4 +#define DEVCG_ACC_MASK (DEVCG_ACC_MKNOD | DEVCG_ACC_READ | DEVCG_ACC_WRITE) -#define DEV_BLOCK 1 -#define DEV_CHAR 2 -#define DEV_ALL 4 /* this represents all devices */ +#define DEVCG_DEV_BLOCK 1 +#define DEVCG_DEV_CHAR 2 +#define DEVCG_DEV_ALL 4 /* this represents all devices */ static DEFINE_MUTEX(devcgroup_mutex); @@ -245,21 +245,21 @@ static void set_access(char *acc, short access) { int idx = 0; memset(acc, 0, ACCLEN); - if (access & ACC_READ) + if (access & DEVCG_ACC_READ) acc[idx++] = 'r'; - if (access & ACC_WRITE) + if (access & DEVCG_ACC_WRITE) acc[idx++] = 'w'; - if (access & ACC_MKNOD) + if (access & DEVCG_ACC_MKNOD) acc[idx++] = 'm'; } static char type_to_char(short type) { - if (type == DEV_ALL) + if (type == DEVCG_DEV_ALL) return 'a'; - if (type == DEV_CHAR) + if (type == DEVCG_DEV_CHAR) return 'c'; - if (type == DEV_BLOCK) + if (type == DEVCG_DEV_BLOCK) return 'b'; return 'X'; } @@ -286,10 +286,10 @@ static int devcgroup_seq_show(struct seq_file *m, void *v) * This way, the file remains as a "whitelist of devices" */ if (devcgroup->behavior == DEVCG_DEFAULT_ALLOW) { - set_access(acc, ACC_MASK); + set_access(acc, DEVCG_ACC_MASK); set_majmin(maj, ~0); set_majmin(min, ~0); - seq_printf(m, "%c %s:%s %s\n", type_to_char(DEV_ALL), + seq_printf(m, "%c %s:%s %s\n", type_to_char(DEVCG_DEV_ALL), maj, min, acc); } else { list_for_each_entry_rcu(ex, &devcgroup->exceptions, list) { @@ -308,10 +308,10 @@ static int devcgroup_seq_show(struct seq_file *m, void *v) /** * match_exception - iterates the exception list trying to find a complete match * @exceptions: list of exceptions - * @type: device type (DEV_BLOCK or DEV_CHAR) + * @type: device type (DEVCG_DEV_BLOCK or DEVCG_DEV_CHAR) * @major: device file major number, ~0 to match all * @minor: device file minor number, ~0 to match all - * @access: permission mask (ACC_READ, ACC_WRITE, ACC_MKNOD) + * @access: permission mask (DEVCG_ACC_READ, DEVCG_ACC_WRITE, DEVCG_ACC_MKNOD) * * It is considered a complete match if an exception is found that will * contain the entire range of provided parameters. @@ -324,9 +324,9 @@ static bool match_exception(struct list_head *exceptions, short type, struct dev_exception_item *ex; list_for_each_entry_rcu(ex, exceptions, list) { - if ((type & DEV_BLOCK) && !(ex->type & DEV_BLOCK)) + if ((type & DEVCG_DEV_BLOCK) && !(ex->type & DEVCG_DEV_BLOCK)) continue; - if ((type & DEV_CHAR) && !(ex->type & DEV_CHAR)) + if ((type & DEVCG_DEV_CHAR) && !(ex->type & DEVCG_DEV_CHAR)) continue; if (ex->major != ~0 && ex->major != major) continue; @@ -343,10 +343,10 @@ static bool match_exception(struct list_head *exceptions, short type, /** * match_exception_partial - iterates the exception list trying to find a partial match * @exceptions: list of exceptions - * @type: device type (DEV_BLOCK or DEV_CHAR) + * @type: device type (DEVCG_DEV_BLOCK or DEVCG_DEV_CHAR) * @major: device file major number, ~0 to match all * @minor: device file minor number, ~0 to match all - * @access: permission mask (ACC_READ, ACC_WRITE, ACC_MKNOD) + * @access: permission mask (DEVCG_ACC_READ, DEVCG_ACC_WRITE, DEVCG_ACC_MKNOD) * * It is considered a partial match if an exception's range is found to * contain *any* of the devices specified by provided parameters. This is @@ -361,9 +361,9 @@ static bool match_exception_partial(struct list_head *exceptions, short type, struct dev_exception_item *ex; list_for_each_entry_rcu(ex, exceptions, list) { - if ((type & DEV_BLOCK) && !(ex->type & DEV_BLOCK)) + if ((type & DEVCG_DEV_BLOCK) && !(ex->type & DEVCG_DEV_BLOCK)) continue; - if ((type & DEV_CHAR) && !(ex->type & DEV_CHAR)) + if ((type & DEVCG_DEV_CHAR) && !(ex->type & DEVCG_DEV_CHAR)) continue; /* * We must be sure that both the exception and the provided @@ -646,10 +646,10 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup, } return 0; case 'b': - ex.type = DEV_BLOCK; + ex.type = DEVCG_DEV_BLOCK; break; case 'c': - ex.type = DEV_CHAR; + ex.type = DEVCG_DEV_CHAR; break; default: return -EINVAL; @@ -702,13 +702,13 @@ static int devcgroup_update_access(struct dev_cgroup *devcgroup, for (b++, count = 0; count < 3; count++, b++) { switch (*b) { case 'r': - ex.access |= ACC_READ; + ex.access |= DEVCG_ACC_READ; break; case 'w': - ex.access |= ACC_WRITE; + ex.access |= DEVCG_ACC_WRITE; break; case 'm': - ex.access |= ACC_MKNOD; + ex.access |= DEVCG_ACC_MKNOD; break; case '\n': case '\0': @@ -805,7 +805,7 @@ struct cgroup_subsys devices_cgrp_subsys = { * @type: device type * @major: device major number * @minor: device minor number - * @access: combination of ACC_WRITE, ACC_READ and ACC_MKNOD + * @access: combination of DEVCG_ACC_WRITE, DEVCG_ACC_READ and DEVCG_ACC_MKNOD * * returns 0 on success, -EPERM case the operation is not permitted */ @@ -838,13 +838,13 @@ int __devcgroup_inode_permission(struct inode *inode, int mask) short type, access = 0; if (S_ISBLK(inode->i_mode)) - type = DEV_BLOCK; + type = DEVCG_DEV_BLOCK; if (S_ISCHR(inode->i_mode)) - type = DEV_CHAR; + type = DEVCG_DEV_CHAR; if (mask & MAY_WRITE) - access |= ACC_WRITE; + access |= DEVCG_ACC_WRITE; if (mask & MAY_READ) - access |= ACC_READ; + access |= DEVCG_ACC_READ; return __devcgroup_check_permission(type, imajor(inode), iminor(inode), access); @@ -858,11 +858,11 @@ int devcgroup_inode_mknod(int mode, dev_t dev) return 0; if (S_ISBLK(mode)) - type = DEV_BLOCK; + type = DEVCG_DEV_BLOCK; else - type = DEV_CHAR; + type = DEVCG_DEV_CHAR; return __devcgroup_check_permission(type, MAJOR(dev), MINOR(dev), - ACC_MKNOD); + DEVCG_ACC_MKNOD); } -- 2.13.6