Message ID | 152173651510.3038.12077049619335033814.stgit@localhost.localdomain |
---|---|
State | New |
Series | "Port SIOCGSKNS support for sockets and tun" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [74.125.71.109] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Thu, 22 Mar 2018 17:37:40 +0100 (CET) Received: by 10.46.68.209 with SMTP id b78csp1011898ljf; Thu, 22 Mar 2018 09:37:35 -0700 (PDT) X-Google-Smtp-Source: AG47ELszAnWE/tNTDjEq7q8vg82SpNieur8E2jB/BBPVmiJZgT7rHPyRAnhqfHGbIw2+Cju4zir9 X-Received: by 2002:a17:902:8a94:: with SMTP id p20-v6mr25978338plo.74.1521736655252; Thu, 22 Mar 2018 09:37:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1521736655; cv=none; d=google.com; s=arc-20160816; b=cLaz8nQtps6AS3R2FUgILWdP+mzAyfbBFbztYVrqMxptF+S9ucko16Z6nwtQpo984k AwWDwfMwmypK0dsfX19JuUSM6lufUd4FZLqaYclvkwazsKN92wAHcnHKftVutWLjosT4 46w09y3gQblDOfSx4g9XLX+/LvhwpQCNgohxSNyuwwEpDInb/D+g8cpxUrnvJ/9ITl4O Be2qG/80dTRdG1rxQGmkBxuKYadS+a6auO0zvid9BVKk+aFF2En1Aew1O1tQGearpAJE EHQ4ZncMDx8L47lLdPPxOaGT+linNyKEEiXQ66AQF76wMNO/895dKDTTMix572lch2PN XjBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:sender:content-transfer-encoding:list-subscribe:list-help :list-post:list-archive:list-unsubscribe:list-id:precedence:subject :spamdiagnosticoutput:mime-version:user-agent:references:in-reply-to :message-id:date:to:from:arc-authentication-results; bh=cwfa3ifSGkPdWZjJlTOuJ6t8uztogTgHuDcdMj4KZKU=; b=AfrbVNgBz8UZyU1oeYhwzVNZhTN5X4zOgJWS23jT8rjdBkrp/9niPK2ZZWaFTSHQyR yqx5nhpBzrM7Dp0GDujpExb2OA3rvDorpwE/XvfwHQLzgUsQ4e8WUOnQ4E/RZBrjwYxL 3KFWpUydxYs2CZligMlMT6z77Ob2lTTLKOIylMw7uYCEbIFc9ZvUZxw6iL2JwNYefw8M EZe2jIdN/1R9by1vUVAZisBnxvxWa6XHl7yE9eq5fwxWHHhaSKsit5CuB3SDmfKpoHHr 2ivU//jinMsJSKx1aJ2ltPOBbMUgwYKLo+MUCGVvJXfjZT46llQJL2fsOocuft76+W+s +tBA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Return-Path: <devel-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [185.231.241.50]) by mx.google.com with ESMTPS id 13-v6si6452382ple.157.2018.03.22.09.37.33 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 22 Mar 2018 09:37:35 -0700 (PDT) Received-SPF: pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) client-ip=185.231.241.50; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: from localhost.localdomain (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id w2MGZbpi009311; Thu, 22 Mar 2018 19:35:37 +0300 Received: from EUR03-DB5-obe.outbound.protection.outlook.com (mail-db5eur03lp0086.outbound.protection.outlook.com [94.245.120.86]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id w2MGZXWh009295 for <devel@openvz.org>; Thu, 22 Mar 2018 19:35:33 +0300 Authentication-Results: virtuozzo.com; dkim=none (message not signed) header.d=none;virtuozzo.com; dmarc=none action=none header.from=virtuozzo.com; Received: from localhost.localdomain (195.214.232.6) by HE1PR0801MB1338.eurprd08.prod.outlook.com (2603:10a6:3:39::28) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P256) id 15.20.588.14; Thu, 22 Mar 2018 16:35:16 +0000 From: Kirill Tkhai <ktkhai@virtuozzo.com> To: devel@openvz.org, ptikhomirov@virtuozzo.com, khorenko@virtuozzo.com, ktkhai@virtuozzo.com Date: Thu, 22 Mar 2018 19:35:15 +0300 Message-ID: <152173651510.3038.12077049619335033814.stgit@localhost.localdomain> In-Reply-To: <152173597433.3038.367966156046888816.stgit@localhost.localdomain> References: <152173597433.3038.367966156046888816.stgit@localhost.localdomain> User-Agent: StGit/0.18 MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR07CA0011.eurprd07.prod.outlook.com (2603:10a6:7:67::21) To HE1PR0801MB1338.eurprd08.prod.outlook.com (2603:10a6:3:39::28) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 0efc28d4-b21a-4d2e-311e-08d59012e513 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(4604075)(2017052603328)(7153060)(7193020); SRVR:HE1PR0801MB1338; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1338; 3:9cU05XL+x66FKAnAt7XNaiOdDC8I/bRfOlZNLDWZmkvh2elIQ2XM5rfuJNsElbot1cvzwobUqU49SZVg5pS4SUgIX2W6ZzoqOD2oR7Hv6DukUYAlfpkbwHa7FInsifQmUwLm8VFYtnE/sEZ2aIcagLDS9j8WEIQR2cjX/AsoY4UdO1Nqeq1aZUykJ47Ng3L+feyA1te2ABQheiwgdkKuN3jVAm1N754bXPFj77xeb//xZCzOZ1oBYvFHPNhrRv9F; 25:Qp4t7CSTWQQyxmCH3Oe+AWBi8CMCVTW+ey17OC3gI0R9eD2T8DRd8/KfxjOP+u0VsiKJkKfwOTFi12bxhyXY1mg7c2DYSvJ3tNV8l//2J8PBnk+Pmg9ZkSQ061ouYJDuOdqhYhvPNM3yblt587AL0dWlVPuTEpGViVSjKw3EbyJJ2wLtqcpkjUgHA2CGsquqgHH705ARbzDpfkRGV2Vywx9yyFjJZ/Is6amYsD2B23yw3qXeBvJwOwELe087ZJMarqLMJP3pQYsp4+4pAlzVqPXVtEFMxAKZc3IHQQvFXWiiihkoyjBcJEwHT2398VqKUojnIao4I7Qh2YeRl1aUnw==; 31:YuzAqxe6l/krPHs8QinGcwf8OzODsx9uOzpS970ycnoWO6abN9YHmWVSfoZly2FGxFshKFepnZ8x0Fg3RL6ujI3qmTywx6ft+Uh4oAbi0EVkU0DYKS6ZX3HWPgK/ogp6lRAzpytw6bnHCJM6hniCCn9uNuZRx3xA7Fi644eyl34YHhbM6MHjyZTUtFhfHeE6qiwBEkb/vzeWyBwznQBgzRWebDw98kMNubunK4l3WE4= X-MS-TrafficTypeDiagnostic: HE1PR0801MB1338: X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1338; 20:YNmPl3+eUcxnIihNexksishdvq5rpcMKGrGvcnwVdZW7j9D6IuB+MXYEKksWgCOO4wE3OpgHR6lhVVIVrVDbxCUgpEwJDK60Fus/LMHAotm10rmy8rLg7/tipqNTA3+kzl2pAxAm3iY71lXATZ1XVx6gtNmrUnaXbmXCzQoKklaSJn9OWRgFCw8rXqStjeIlPspTWiTDB7oW7jBWIB9SagoaLdIQij9/j/1QjmLG+QiIlddZzOJ6cd/HZRP3tX5A1CEzwh6LjyWVRr4u9MZN/7M8MBGoNl8XhkhJqMUvRbnGgcysZWq3DoKqmuZ6ND5upz8BoiQDNZ0cagqEvhkZytMewlZ4rxUya7+VF3jmkEsXnZEC8yOJXs7dJbx0MFtqtNwL0z1hb7Tout+Q/S14isHG00ZVw8jKssJYuQyWuOF1eckgHSRmZy8S/GEo77j1ATMo7iYSUb9yRh8A9NblavUmIjQ5CwDf3j0XIk6jDhnSgm7JVJU6sjrDf+5MNtBC; 4:CcVvMsJJzzNTbx0cg3YR+bTAxbElxkKmVMD9/JKcd5Ayg8XtRXq+0feT98S9Z9Rbvw+vBJbY8mfvNu4FxkNSB++MACDHS93sqaDpslelH/a3yBPuXOPbIB+DwjYj1mD3XK7BUTqQmWU+caHFikJsjcqz8D0H1n6D2LrnLQ9N1o6GaNDezGg+0EYN8b2gQjvdpRKKFFbpBbhunG53Ki40307BjW3PyouRCueXsAetNP8opTt/jge12+I9q1Uu078wJ2aB3LVQK6+kXHZgzJ7KrA== X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101524173)(2401047)(8121501046)(3231221)(944501327)(52105095)(93006095)(93001095)(10201501046)(3002001)(201708071742011); SRVR:HE1PR0801MB1338; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0801MB1338; X-Forefront-Antispam-Report: SFV:SKI; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:HE1PR0801MB1338; H:localhost.localdomain; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1338; 23:/SLdhGaVjlu0px7ssJ46NpNMXN8M1gI0H5OjF2N9tvdtt+1TjoQnR0JnbDh7k/uSYG98NFymNj9ZZsO+q7n8kCOoWCS3wvNijrzmfPCybRXMF9KlmID16a1gBNbZnvNhyiHHUOMaEvpI/6jpKasG9A==; 6:dCZZnqvjvOj5KAkGI1wh/2DQwhjCWymJxweXvfP0iBeKgKxRIc5gV4TAAhRh7vNAFoGWIBYsn8lmLtLPI5/yqyrJRz4sYNSWm/ru1k/sapN+C2entV9HhPam4+saxFTgg13qEjcc3vlVlF/VGiI1xTyLxneNbKjxSrjmuMUcEss1lLDTwfqGBGOVA+09CkqTU0KsYrS20Y+nGf2vgBa+JyIeQmbCJGLFjydWeoiVsY6FsrBiaJBxDx4q/2Bfz/aVzTCes+liw79JZwPOD0P0ALrx71XpWCu2LUsglZT8SrZqUB9LyVOOpf72gqUWswFVUoi0giIvK3Mj/8S34jx6ZtpFWCdTe/yQ/CT37o3rPcA=; 5:NUn08WPx9SJ2eQX+MTtl0mu0cZ3QJgAv2RpVYdkDe6Y5FrtCqmB1cOp3tPfOriXFYxEwcm3D+t13V53qejMdGtw0cR2C4LuoEI6ri/KQryf9iSITjOgRtUqv4RFMCpyNfYKZGOhGuEeb5oKwpStGgytemhumvAB+6VzehkQDSB4=; 24:RIrriaXdK2+sxoduO1W+UJQasAniGzVVSkSTYduO+ILO8kL2ItRaDTnnHCW9RlZ01uuazav761NtNFdW7bvUxCVRl5RzzQhEVNeEOeKGrb4= X-Microsoft-Antispam-Message-Info: ERpkVwVP5s86gTgsAou6wKyibXzIxzwX5pSuz7MUoWC8KD8kTDGEZy5XRHcqplkUw9Nbt7VC40ehgeZBnoqO2GNgnCkaKWD1o0APZJ3spncNFG8GzT/1R5koJXoqIYrfgT+aXAHluNw8QBX3oD+Kmut6K2TQFXN8sPDoyEcimmwe/ERP6UNnFSYdCIniH2oW SpamDiagnosticOutput: 1:0 X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1338; 7:OeX9LAA4woSGBNRCjkH2ddOGfg6NDTbdmZ2IxRoCIHjMO+x9pQ/hjdOGFHv76GGE1bQ/jYDTgHuh6j1PqwlqxGATPnhxqibeGemhjVCqCJI8ui/ZmQZe6SwsSyt4X7ihbTy8uzRksw+8eW+HizknRk8pmLRh5X9KX6vX0qYFFmyTvIMwMPQVxdkhRP9A72X4M5GzoRA2duzOWFEQK88NiX44fdKNl5B9BwnM0iWZi+wCbTxjKDo5RkpTpM8SbQFF; 20:rUCox3VP1kMWsjn+Gt0e0SxuxbcOX1I9ZzkKKJEIUp5DkgIkSpmtgheCmY3Cvhhp7EMxncfivoT50LiRR1prf68Us2iwMDPMzueYybgl/yiQlfNHMrI1bVr2lZnr53tCKb/ANXUzQ7NPQCnATVkCY1SwxV6ug+Q/W1l252583Q0= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Mar 2018 16:35:16.7344 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0efc28d4-b21a-4d2e-311e-08d59012e513 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1338 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 195.214.232.6 X-MS-Exchange-CrossPremises-AuthSource: HE1PR0801MB1338.eurprd08.prod.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Internal X-MS-Exchange-CrossPremises-AuthMechanism: 06 X-MS-Exchange-CrossPremises-TransportTrafficType: Email X-MS-Exchange-CrossPremises-TransportTrafficSubType: X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-Antispam-ScanContext: DIR:Originating; SFV:SKI; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: HE1PR0801MB1338.eurprd08.prod.outlook.com Subject: [Devel] [PATCH vz7 2/2] tun: Add ioctl() SIOCGSKNS cmd to allow obtaining net ns of tun device X-BeenThere: devel@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: OpenVZ development <devel.openvz.org> List-Unsubscribe: <https://lists.openvz.org/mailman/options/devel>, <mailto:devel-request@openvz.org?subject=unsubscribe> List-Archive: <http://lists.openvz.org/pipermail/devel/> List-Post: <mailto:devel@openvz.org> List-Help: <mailto:devel-request@openvz.org?subject=help> List-Subscribe: <https://lists.openvz.org/mailman/listinfo/devel>, <mailto:devel-request@openvz.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: devel-bounces@openvz.org Errors-To: devel-bounces@openvz.org |
diff --git a/drivers/net/tun.c b/drivers/net/tun.c index 8cd39507c64b..9264c06fd7d2 100644 --- a/drivers/net/tun.c +++ b/drivers/net/tun.c @@ -70,6 +70,7 @@ #include <net/rtnetlink.h> #include <net/sock.h> #include <linux/skb_array.h> +#include <linux/proc_ns.h> #include <asm/uaccess.h> @@ -2224,7 +2225,7 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, int ret; if (cmd == TUNSETIFF || cmd == TUNSETQUEUE || cmd == TUNSETACCTID || - _IOC_TYPE(cmd) == 0x89) { + (_IOC_TYPE(cmd) == 0x89 && cmd != SIOCGSKNS)) { if (copy_from_user(&ifr, argp, ifreq_len)) return -EFAULT; } else { @@ -2276,6 +2277,14 @@ static long __tun_chr_ioctl(struct file *file, unsigned int cmd, tfile->ifindex = ifindex; goto unlock; } + if (cmd == SIOCGSKNS) { + ret = -EPERM; + if (!ns_capable(tfile->net->user_ns, CAP_NET_ADMIN)) + goto unlock; + + ret = open_net_ns_fd(tfile->net); + goto unlock; + } ret = -EBADFD; if (!tun)