From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755609AbdKBRQo (ORCPT ); Thu, 2 Nov 2017 13:16:44 -0400 Received: from mx0b-00082601.pphosted.com ([67.231.153.30]:56380 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1750722AbdKBRQf (ORCPT ); Thu, 2 Nov 2017 13:16:35 -0400 From: Roman Gushchin To: CC: Tejun Heo , Alexei Starovoitov , Daniel Borkmann , , , Roman Gushchin , "David S . Miller" Subject: [PATCH v3 net-next 1/5] device_cgroup: add DEVCG_ prefix to ACC_* and DEV_* constants Date: Thu, 2 Nov 2017 13:15:26 -0400 Message-ID: <20171102171530.7627-2-guro@fb.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171102171530.7627-1-guro@fb.com> References: <20171102171530.7627-1-guro@fb.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [2620:10d:c091:200::2:53d6] X-ClientProxiedBy: CO2PR04CA0112.namprd04.prod.outlook.com (2603:10b6:104:7::14) To BL2PR15MB1073.namprd15.prod.outlook.com (2603:10b6:201:17::7) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: a4715f04-d61d-4a59-e41a-08d522156c47 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199);SRVR:BL2PR15MB1073; X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1073;3:KqGZu6aRmupmtKbrZEWpV8Mh1e9jGQr2EABP6Dm1nZyTh7Tvg+yTd8Gsq2BP1fvBfq6xNemRgEMvPEvREsn7xwRIurlrdIgyEanXub0q6qFbIU+VHuBNTZ6Fhsj5QJR5AWV26jkDlApRivbwWrYKKMrODG8IvInOYaO9jeLtIwNPbEF5Qhfvu0aPEZEb4el+HEVscxkh/fdREhCB268VkfGnzLkEwiOGhRoUMpkOh0R772qVnetNi7WJHIvQx/91;25:7rTYs1tBx1S+6yNF2BSrlu8zuhJB9mQazZtPXerDR3j1cKbKun+4yg8FGh4CeuMS6dS7PZuZebWqzYJniQuNITjgZAGDW88s3KfKhJvk7RDQtIAaIPbHXD/c8uoo8A4Vh7eKKPv01ETxxvNmIdI8XCIAAJS8dSyFVyDJzPwrShqO10aKFY5AsSov53kBC1zu4zN7dOXrOoSg28rSahh1lb5cMYEFlBl3vsOLtdjuA+YxZShnmWtb1wLf000+omX4UvupMMnw3b58ALuh3hlOoMkp7nBqAeKYfENHXrS+RIpc6OOqYOFlNrJ/Bi8GTuYw4u2nhL7Q+gXrSQLq0AVFjg==;31:3qgEoRsV5BWM3ONkaAWYbO1anRg1bgNUpQAi1prcwH1Y4/lroAIX4rAWVyIHQ2trt1LaJ+8aPhtZiGFpsOP5gjo9FYgkkn0Jc9tJxlPnSAkOxKVT2En3LClFhw9niR+TFHoenZfXMLDJtSi5wBusn6cUbVKFucY+qefmvGvIjPA1Kj0XL3r7cAhiuKaVc8O2sKUAeeYdzCLL7UzNsHMzynJZ1lr2DmKA6sx4iMZ8dic= X-MS-TrafficTypeDiagnostic: BL2PR15MB1073: X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1073;20:gORdWRSbYgs39Taiqak8fxVYr7fe/qwgParYsLmKbrPFFo1P13aifStMDQiquQj4caSWW/3V/IC/ozYC97fU4dViWtrntVz0FVIOXAzYEWNNfoSF/gZUgqMTyS8Z7hiXyrDfcpNozJQtlPgO25owyyiz2E8BusfXVpxTWaJtx6WFjjgToMAMgRs6XIMpqL069lnTYnf2sjPwI0J4QD2Ij1bUjBxA6Gf+3Wo9bYMH6RNb/21aoFcd7M62wWMs6p4fDfMI4COL9dzGmJ7LCbqgtPmf5AynC8q6JVxlax3s42z0ETDtVZKNuCxr+oRdcxCs5zj6o+NFDCShE1pJb+Dh4uJmMNL2h3tyr29jNT/UN2WfmU6oQP6BmGjlxHdMiAQTBLucta+PpHZHPBlwqGKLI7U2q08rtNYHW9KhyXW6RNeKYpcTuhIBbzZrE6JgxfvCVUp4VP9zffcPjqxPRwPlvCxym583dE5ByeUkZqpg+tImcdD2qcOfrcK91y67sOtz;4:j9uyGFhre+/6yGkIKsOU50pQ1rTu/HkCdxVu9n6qUHWedA9Jz9dHYyALuKIWhjCRZKZmtyyQsctUSEEy31kMufAViv8omJUwX2ID5ybmiq65pQBFuHqB0RTc0k+kCG2zFgTPHMakd7+ngUbleRPv+NYRNC7aOMj0F3FHSTQFnmmCr0EwO72Lh9KPY0cqZhnOaAh0jNyvuxGXVgGhN5qZdkToIgVbnOrI63BsIZYlQhKNAyyxN0ek5Qx2c/V3fN4b65XjFH9nT/eHg20b3k+T67ooQ8PJPxfbWGz4iGainU1s9EmOAB1PanrCS2+WbckqrmbpieXEjE5CzkpPM5ILzdwqOXzw6UX+FWyi/Oa65fU= 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)(8121501046)(5005006)(100000703101)(100105400095)(93006095)(93001095)(10201501046)(3231020)(3002001)(6041248)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123555025)(20161123562025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:BL2PR15MB1073;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:BL2PR15MB1073; X-Forefront-PRVS: 047999FF16 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(376002)(346002)(199003)(189002)(50986999)(76176999)(478600001)(53416004)(33646002)(54906003)(5003940100001)(2351001)(105586002)(4326008)(2361001)(2906002)(16586007)(316002)(106356001)(305945005)(7736002)(25786009)(101416001)(50226002)(1076002)(8676002)(189998001)(36756003)(81166006)(81156014)(47776003)(69596002)(97736004)(6666003)(6116002)(6916009)(2950100002)(5660300001)(6512007)(6506006)(68736007)(53936002)(48376002)(50466002)(6486002)(8936002)(575784001)(86362001)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:BL2PR15MB1073;H:castle.thefacebook.com;FPR:;SPF:None;PTR:InfoNoRecords;A:1;MX:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;BL2PR15MB1073;23:0Mlno+vMSlMI6utz5ZjMzSlRNY89aqXKZORRzC91k?= =?us-ascii?Q?INhvReInbXJr1kHBcj9LYwisZ8k7fpOIhuBdAlY0C9NCQ0PmdV/L2lgJh9gf?= =?us-ascii?Q?yGAr/seGoFoQIM3nIT9ynX0o3lv8IXaqym1l+sMwScgeuIdeI0ynT1Pfxu3/?= =?us-ascii?Q?yjfg7qxQhwtRZ2BST0bKV5+R4lhpIcl61GlkDMuIWMpuBrarJ8ohtpn6p7Jz?= =?us-ascii?Q?VdX7SsA9d41zQd0QuRPI++fr/mOscsODDT6+m3jido5krMEvI+FYR27OLJtU?= =?us-ascii?Q?OdRBfIFtCGCR7PJRhG3nUmrU2U6z/iz8yLhPNRgEEsiJCLCC6R7v/2mmN2vw?= =?us-ascii?Q?155g9Ah1e6AP+hor1f5HTAr3w0qNXlBxxU4ZEqWJagoXkTPQEBIHT+MJwRA4?= =?us-ascii?Q?veqvhCF8bn1cId6sPr40miHlCZvY7qrfE3/0Xs2M5OnsSmQ3kauoVFAOiAZX?= =?us-ascii?Q?KMx0pMBb8mOPLKkjoOoE5LPXol+4Z2B+5VF/k9qql55tanjs5Bbf3IlBJBXT?= =?us-ascii?Q?i/iCuSF8z7tAazDo+UEGWOCyvb34u8oa/y7gVx6rRo6KsaURb8DMsnZ+D68p?= =?us-ascii?Q?YE3iBgfV1LPtmlWbqurL9Px5iNRNYkF7UB1uR3m8KJlP969iY8xuXr+Efspa?= =?us-ascii?Q?zKV75FvZ7FrQJvjPVnov3F530Qzd+BdPtqTB2yI5ita0/niwCEzhGJtsDJ9Y?= =?us-ascii?Q?MVUYcI8Ny26zIyuoU3fi9xKPDCBJsosUyNude/JDTwtj8U8cocZSJWniFq7G?= =?us-ascii?Q?YldP7zS0YG1hhhHYElwQVv7tI0lR641uWS2XnBbgLmA4dIVf5CikWPehyfBE?= =?us-ascii?Q?dut+ngonRHFL9oZEsdY+UaTfWZs+oJ4WiVwrLrO2n8NvCGrvycZt+jsXoC8V?= =?us-ascii?Q?rT66GXEDigtc46OYqJtuN+BuvW4wO6FwxE+iniQxAP5z8BwHdmmdL7lcbG37?= =?us-ascii?Q?2XXQmTNPlDgXQe/mx3tHDqMbgzQ/Awd5PWPGmsBgSPUjfpl03XwZ1La+wpyO?= =?us-ascii?Q?Z9pGm7h26PV6DaIpAi++mmWhAgGSlNBEYRIVFxk37iAfrQQ8Vg0iWpJivPYI?= =?us-ascii?Q?7kwS8k+fN2ti4qUY1vdlb+I76OpPVZ8fujp3YQ6d+9QQkrmy2Bj+QenkCeg2?= =?us-ascii?Q?xjwVXx8qTbN4I/E+CLcCNLuQMn/N6VDQbqom2vIvAI0ejeKwgepUA=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1073;6:3J3ZJiKZf3qNvI0kaa2PknWlOLetDy5SX30qQY7uA0jq04H9tuewR82/DeE0F+0RkgKLkpUv9W/dw2GD7bQkctCmbpC8vGG5qUVkRzP6Wff5WQafh38S4THQjWWCvTMDtU+ap5ugDQwqv0x49tBecAGm4IhizsZ+le4bi/ncpDmfLeuafhTgZAaHZ+8qDlCOcgbOUbfyMmdpIHHq2Ba9ngkPFDBt0j+gy00jRIWuBcE2XU8oDC143LIEJd5YkHIcz7dfYChdiwBl7PxVj8Hjz45/92HR7Pp1mlmMOQAY68FwFRCLB8b0AERwxNa/IK72T/MIXbxtEsAJTb3HWgKJFGpNsSvNJCxIkaqHHYIeOUI=;5:LtHB8KzM7fsjjjUdpFRofOPMs2yIT9bYz8KHba/9VSdOUSg/hrXkXDwI/9tlnCmNdP6AAWXGsCEnjq7nmyerGZGGyT+zPWImP+Ew1echNDJ+6wDV05pEhZIQpCgW/iliyLVER7tbX/9plAP+E7+NT9uLEvmt56uhh67dRwvoWhs=;24:vCkvwSm16akgK//gbJrMjLQbXlbyau6xYBhZUz/AtryGaUrCqSnum9XRKii3ZEm7gqpmLYvpoxS2WJAAX5zegjXdh+WIebtf3R2UgxZ8I4A=;7:nwm5R5Z6qzrQJG6AhmdwNwl7sfDjyprkkKiaeVdomE3J6aanowBiFYz6hOpjZDCQBWAQJUSwlcD6ZWXVKG9giQ9LvGjcIH/HRCPhzUVm/J7GyDUDQfN9f5Y+GJyu48WjkO8LJC7dHBYa+D7fbxNfMer6yhoGfIlTPkdz0a+6DRvy28ek3ZdNW1OVZ07VQkzWGYVxPoJO7qkYBTYNgwLdqwcEI+8uyEkmT5gMEghN27YU9mnYVSOVB09Nb9v+3lH/ SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;BL2PR15MB1073;20:TsIlgwRzQFq4FD4H4eTXzbEUu3GxDsQBfDElAlJUdj2Fr8tzkbkXDlBsjN2UdgiphfMl1FPqaqIwAkBHj8jlSWNv6UsFKBwp6DiWvLaFYv6IqUxAsH1altJPfP9mH0xFAmnmo/pk/VCQZ0mGp/ksH+ZnhI5wLr88eAVtzJqrmGA= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Nov 2017 17:16:12.6913 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: a4715f04-d61d-4a59-e41a-08d522156c47 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-Transport-CrossTenantHeadersStamped: BL2PR15MB1073 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_06:,, 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