From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752879AbdKENQw (ORCPT ); Sun, 5 Nov 2017 08:16:52 -0500 Received: from mx0a-00082601.pphosted.com ([67.231.145.42]:46084 "EHLO mx0a-00082601.pphosted.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752357AbdKENQr (ORCPT ); Sun, 5 Nov 2017 08:16:47 -0500 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: Sun, 5 Nov 2017 08:15:30 -0500 Message-ID: <20171105131534.25040-2-guro@fb.com> X-Mailer: git-send-email 2.13.6 In-Reply-To: <20171105131534.25040-1-guro@fb.com> References: <20171104.224008.1289480268047106418.davem@davemloft.net> <20171105131534.25040-1-guro@fb.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [2620:10d:c091:180::1:3064] X-ClientProxiedBy: DM3PR12CA0094.namprd12.prod.outlook.com (2603:10b6:0:55::14) To DM3PR15MB1082.namprd15.prod.outlook.com (2603:10b6:0:12::8) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 3ae5ef2a-02c8-49a0-62df-08d5244f5dbe X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:(22001)(4534020)(4602075)(4627115)(201703031133081)(201702281549075)(2017052603199);SRVR:DM3PR15MB1082; X-Microsoft-Exchange-Diagnostics: 1;DM3PR15MB1082;3:E3sx8+HlelhnHUdQJqZ6WqAS/i4FHqozWaHvL6yXJwar7KSnB5UISICjOmKKOoDh9LFDxx7QFwp0HUXhiDg+cfhMUoZGHu8A5JK68G1g1SrCgqa12VE2pNWELQT3b80TYDPpVZwyTwShPIxqzh9Y4Tdd0SPQvOlbApyUxBnLQPoyPk+bFN92tguzjkPmGPcff6+7U1xy49xu9KFPTZjtPatynu71L8iWLURoxLd8xD9fmjQik/kxSDNwDhWQpv58;25:ETt5BU7GxhZcSyIZjsaO1iZxIBhKEDY0k2Nq+0cGm/bbNpHh/IYsSLj+Shhv4sSBXb5T2UUYLlaQ4CdmniaH5K7jjreO2iROwlQU9zLbJVC8HGuPwvsj53OAYs8UDKMD1PrPhsxnLNfWcYpCoWyfoE7zneOQJsKrZ1e2YNsKoTMQk28iAD2O8lTWxGRWtp6Z1SCTewPjaIcmQM3jnhqxI7BVtQPJtr1QjXH9sxqeYBRdL91Zy5YDmqSj4CcKpONFclwdM/TEqXK5XzFDhWBGI2IzQMuAznbjw0C9wyJHXea6Vf2t/SDd48CfEHgz0LzHknmEYxwkFRQ6oc0sLvPMzw==;31:Nz1wmrhju+Ul+1J05hnexvHCdoxSkbpC4Gw85L1pGAw/rxr39nfnbsXEOq8/0jJJOXCphJdumIXBSUzN7v4rij7GG1HPT8xuITciJhEF3FSKvvMAdmXdqj/J3GoZFaTnQNl5b4dgPbX6EYOFxu0i5wzTy5p9FA0R0iqIx+kqrv3JShwQLsKOLJbI6nHJq1Aj11uWbfbKqExmUl+e+xnEneBdK3dkfoH8TmmLlXAtPIg= X-MS-TrafficTypeDiagnostic: DM3PR15MB1082: X-Microsoft-Exchange-Diagnostics: 1;DM3PR15MB1082;20:E1UBukggXQ/xR9x2BzEmDpCTUYp0RAW8kbhfhcAuXtF7J9MCmzFdoll7yGujNjWhgobgeW0lTDUjme5D3mewbB1op1dwJv5VXdsGnQSAASt51YBarkKwZvLuiXOyO7zUN00+yzbdoMoJXAYbrgTpbPE8WyRrY8LRqadUHMm5IRVntvrINFyI1QXXu74SWaD9WU992oXS7fQuOvAoCMeZWlGbUrVhKuOdhPXC4KriKpyTwjFvSqvu5KdsCWc1LRqGC5CObcPPLozPtzStrHUPD+9tV91zCXiaMRShKcZtA/WZE0b58lkvXpABglAmT7kyi2V9kgKfPYu0FN1NpmtdfZKl1ej112MBOSDmBP52Zy2NDlnuY16Cr/BGw8S9PVKXkldHppvdJwMyzdKXW+M2F0XqdldjTFNtpcd/czaXswU3xoQQ7U2KvL27IP6b1OD+0JsD8yH1eezNNTxgidZqVQq0x/kFpPmPhfVjNTb7YZ6D2aeI6z+OCi9vzqw0qpDm;4:/wXzD1vDB9Scry94ZAX+2ElNORyWhf6Agkh5vFBxRNqPRYZMXTnYtND/qUGp0wer2/M/a/XsNq+pY3wg5Cx0AcJaw9kAnFIjahgGU/4mirUW9XJndBy5mVLQRwzYhFzXrzq7GRI6aVptxYByYEpFButkZfJ0mMcoZlS0p4x2oQcTp+xkEJ+2XzJBkTOrty1+totn5sCXy5yBm49m7Z7X5fCBqH67FJkmkZ7OiBHPpEH4aH+Xsmzst7mSejYPLpz05K9PfU5lL6gqfDkHRHdmnv01O4uLMLQNiOJtlrI/QVBmIbedvxegrD45MDMumKVpnqMBt8QNMimm3cFBX5fTC3nqDkxyF7AsU4tPoy8Jrso= 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)(3231021)(100000703101)(100105400095)(3002001)(93006095)(93001095)(10201501046)(6041248)(20161123564025)(20161123562025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123558100)(20161123555025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095);SRVR:DM3PR15MB1082;BCL:0;PCL:0;RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095);SRVR:DM3PR15MB1082; X-Forefront-PRVS: 04825EA361 X-Forefront-Antispam-Report: SFV:NSPM;SFS:(10019020)(6009001)(346002)(376002)(189002)(199003)(5660300001)(25786009)(316002)(305945005)(76176999)(6486002)(50466002)(50986999)(8936002)(6506006)(50226002)(4326008)(101416001)(68736007)(54906003)(97736004)(36756003)(16586007)(53416004)(6512007)(478600001)(69596002)(47776003)(5003940100001)(2950100002)(2361001)(33646002)(106356001)(6666003)(53936002)(1076002)(48376002)(189998001)(2906002)(81156014)(81166006)(8676002)(6116002)(105586002)(2351001)(86362001)(6916009)(7736002)(42262002);DIR:OUT;SFP:1102;SCL:1;SRVR:DM3PR15MB1082;H:castle.thefacebook.com;FPR:;SPF:None;PTR:InfoNoRecords;MX:1;A:1;LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1;DM3PR15MB1082;23:/e/GMd3/2c2DCInBycPlcH5TitiZqjHeeHcE5l/4Q?= =?us-ascii?Q?uyrx9/l+/iLmOZ2glDTSAauOaLffJdQYDND2Eg/K3oQBeLMK3tto2C7tkhTc?= =?us-ascii?Q?okFjAp9jYKNhMJiaH+JYCT+yagsdCrBrM7mYTah9rgIB+ZpCQTI79VVoeAJu?= =?us-ascii?Q?UqRlTP+lRgVGM5ZGSPObdqnoXOBxk3PMLkBvRSnY+ySH/o/Z4f8qULff6GBY?= =?us-ascii?Q?iHf+x/Ort5PaTifx/XxTxEeIgQYa5U39aDGDamvzrjUWanzsoAj0ek4tlxBA?= =?us-ascii?Q?r1KMlnEmCKFxm1WSJ+cXwKRRgJLoNf5CuRNf2QIwoBoQeJfR7lM8apONkZmQ?= =?us-ascii?Q?i0LFTh4RfscyHkAT5a+iGmtQ7qtFZkGK8wlKnUDxS4ffBp76UuzxSsP1iNnZ?= =?us-ascii?Q?DjcK4Pm96875lHR9vtLTq0QxdW40E8GHGT26HwKu/u3y50FFSPRwQmDs36Ws?= =?us-ascii?Q?kE8KQq9JwKjAU0zu4vYSxg2+B961udKL2MOuuN5KtPL3oVdS9gsjLIFOwHwq?= =?us-ascii?Q?xKYKzlhSWEgrCeVsngIYKbIgYjjPRLi4nNJpbFcFr0gVMat+MfV60iP4sKae?= =?us-ascii?Q?sX4vaPe1V4GqqG0BXB/Tj84/LWZmv1XN7HDjpl/UeIZJVrZdugeCu80uqJm9?= =?us-ascii?Q?XZmdAVWUvspxVe8+b2qpVZl5LOyz+N7Z2T5hTKLN32bSVytKNbu/07spQePK?= =?us-ascii?Q?l9HekftGEBHJr6ToUJxnaf7iP5kD/akGAxmc8yHOlL0GaIFwQoQodxijWOjK?= =?us-ascii?Q?i2kTN6iz2IdDYBStAcEWNm2wcSJt61tEmS/bb+K1dl01tcEsmtvlJg153V+D?= =?us-ascii?Q?/z9wZSSkdyU6YlNNNMfxFr0zE32Z5Ad9bbqMGTMMXeIsAcVa/xs+QPH/39v+?= =?us-ascii?Q?YAOHop74Ukq6GtMR0QljDabUl4R13WzY+2TP2I1edotUzGYJNdB+67m9Tsi0?= =?us-ascii?Q?zbTqq1U10qTMKkglqritiW9so4unxvcCVslHCVB5RyCGEPcbdf59h7woGtVM?= =?us-ascii?Q?lWC1g3XOLbbJjKWWjPTQH71owxFpMaR9RUP9f2AsXwDdyAFtfFNl53q1fKuu?= =?us-ascii?Q?XrgtXgmm2ky6jkxlDYew+Qaw7OB5IdJGwc20PK/elVwXMxW9EX08TiFcr7hj?= =?us-ascii?Q?3C7F5GqUVfLKRRnRCzeao2yvv9l/Ox9?= X-Microsoft-Exchange-Diagnostics: 1;DM3PR15MB1082;6:1RKaNev2Z9WSDRa0IZPJFc9cvApXHJ+r0msNQJg9iQWPKnpdf5bQUuTh1VS0fz1Ajf9dyWDJS6iXi4MWeBtWIMrLV18cjABHe/2Mv4uH2wa5jesVp+tNDgCjjid8/1m3A/bISO8ELsKe3dB7h7b0P8rIhAmyiDT37xio1VKabtMwa3MivXevkGwlvWmvx93fwDynEBzJWLMvIxwlU/bbqYIVANSSm6tkUvauHsqwrx63TAjAXXCxWq5aT5KJR1vfSesW3USFcyYcI1DbnVXIYwkoTJcArO8Qf5vqeGU8qnmHgsXJFePmrBCFi976HsdVGWQ/JnlPnEGMhkyuMy3nQUbUQNPxBAvybn/r+2KiKh0=;5:Nuo03gKZO8ONaypkpH9EyZPK8WJHfSb41JqP+talnIOh6WqYipPhcOIqkg7T9EUs7ltNv+evorDyG8/Eet1A63JgAfoH6/DnbqzdRoY0atbfOSkZNEk/yt0X1J+lnC9Z/QyiYVRw0HJpS6lcw6faUjLb40rkO8LI2xYlXZBwM84=;24:38mCHtNdlrKCrs6nLqWeVtM9+5tmt/Sr4uCF56UmBAhQT+XcXXJS/Q4gww5m6iRk0Rr7YFWr/FzKHgzZaTERAcKueg/z/5qtjA8lhizKvkU=;7:0hAtyjqpMXOlHlOMESEMyEqLbBxbArfpDqHUg5wxyhCUiGOPOoznW3o1MDnzq2RwDz6n937ZdXtKNWKgSizEgTsNziBHs3qXG1/a1sg9zoAIxR8UNJDeKgKdMa1i7yrgO6vIVnvwX1FPfUk+n17bw6x8yFFCFbF+qoYU6zIfnMy32/G2d17PJGlCpDVdUYT/haSEHvaZOTJiGw/5JlzgiR+op2yIT4chc9hDLGNhaS+lQQCEmXYp5p6fHk96346S SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1;DM3PR15MB1082;20:EhNQp3yxsksXu+utlra2Z+dhb+UpA9mjFtAufWg/xmyAtomakprgFYXZTuUtj0G4hBILAhfR0SBRNTz5va7/l5bUEfGPQAre+foizKMB/Eks4IetyxLd756GcHDufN1WLCZtZpYwKPj3RfMYxfsYX+ffwXpvkf+hgsM/qP7BeRE= X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Nov 2017 13:16:02.4848 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 3ae5ef2a-02c8-49a0-62df-08d5244f5dbe X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 8ae927fe-1255-47a7-a2af-5f3a069daaa2 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM3PR15MB1082 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-05_03:,, 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 5ef7e5240563..968c21557ba7 100644 --- a/security/device_cgroup.c +++ b/security/device_cgroup.c @@ -15,14 +15,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); @@ -246,21 +246,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'; } @@ -287,10 +287,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) { @@ -309,10 +309,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. @@ -325,9 +325,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; @@ -344,10 +344,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 @@ -362,9 +362,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 @@ -647,10 +647,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; @@ -703,13 +703,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': @@ -806,7 +806,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 */ @@ -839,13 +839,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); @@ -859,11 +859,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