Message ID | 201705051503.v45F3gfG023749@finist_cl7.x64_64.work.ct |
---|---|
State | New |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [64.233.162.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Fri, 05 May 2017 17:12:27 +0200 (CEST) Received: by 10.100.181.168 with SMTP id r37csp254775pjb; Fri, 5 May 2017 08:12:23 -0700 (PDT) X-Received: by 10.98.144.21 with SMTP id a21mr8037404pfe.181.1493997143509; Fri, 05 May 2017 08:12:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1493997143; cv=none; d=google.com; s=arc-20160816; b=HIPpqM5VWgV12SKEQY0AQgVFu2PQMXLOAmkfwXs/Xf6ECOvtN5acpxKUSLXP6Uz6Aw sKHpIN/5eE9pjDuwsFP8flWDoR1hijl6f2cKSATtPkD9fwpp4X4hcbbpLqFV/VZwPDsR YHmLpQH3BoKrFCNb1X0L0iKfq+YAbESbkElDYgE9igemGNM0px4gfV7rhfz8zEV0IUOi Z1OzIDSf/z2VHEbQNQJtqXTsI8w5IXtvLhMk+mI5/xngAIGF4pzd9YGm68i5tDY0oYUg wCpIA0ltwDDZ+eiC+MLzmLguBFJlVmFrCHFKJFY1ZSIGzEFltplJgaInge6EnCYqdiK8 wP9w== 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 :cc:spamdiagnosticmetadata:spamdiagnosticoutput:mime-version :in-reply-to:to:from:message-id:date:arc-authentication-results; bh=2crwsNW1xmhzYLFFl/El3rYRP9J55DmG1f0q4gk2KmY=; b=H78bbuzUVmFq/U0yu4H5pGpCSJCFNmiBsJKXdghDKl2i3sq+A3IGnDh3P2PuaCsZgS jYaXrwotbdsPb1yrER+LKxcWQYDScCHUsyjuzCk16LQ1caZjDbQnbhm4JS8clZWYwakk E93Wj1dGuHnhXLNaqc5uQ8LPIVamqEzyIrHS/AitEWBFEkgaXJrEU3U7iZ+PL460ieC9 D3IPspPCCTlyLcqM6u3Tpyxmw7EnQNsqXCmlH5ImEcm61kPfy4fuKsjGA5ZVzuGzspUs IxD8EatyvN02wnWKYpALzPwHcLnWJj8QRAYHIsQhslMJJmz+XYKkRwIxugps1Oxdk3fQ qx6g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 195.214.232.140 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. [195.214.232.140]) by mx.google.com with ESMTPS id o13si5655130pfg.277.2017.05.05.08.12.21 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 05 May 2017 08:12:23 -0700 (PDT) Received-SPF: pass (google.com: domain of devel-bounces@openvz.org designates 195.214.232.140 as permitted sender) client-ip=195.214.232.140; Authentication-Results: mx.google.com; spf=pass (google.com: domain of devel-bounces@openvz.org designates 195.214.232.140 as permitted sender) smtp.mailfrom=devel-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Received: from mail.openvz.org (localhost [127.0.0.1]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v45F43S0011816; Fri, 5 May 2017 08:04:07 -0700 Received: from EUR01-DB5-obe.outbound.protection.outlook.com (mail-db5eur01lp0177.outbound.protection.outlook.com [213.199.154.177]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v45F41W0011813 for <devel@openvz.org>; Fri, 5 May 2017 08:04:01 -0700 Received: from DB5PR08CA0039.eurprd08.prod.outlook.com (10.163.102.177) by HE1PR0801MB1499.eurprd08.prod.outlook.com (10.167.190.141) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11; Fri, 5 May 2017 15:03:45 +0000 Received: from VE1EUR01FT037.eop-EUR01.prod.protection.outlook.com (2a01:111:f400:7e01::204) by DB5PR08CA0039.outlook.office365.com (2a01:111:e400:52c3::49) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1075.11 via Frontend Transport; Fri, 5 May 2017 15:03:45 +0000 Authentication-Results: spf=pass (sender IP is 195.214.232.25) smtp.mailfrom=virtuozzo.com; openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=pass action=none header.from=virtuozzo.com; Received-SPF: Pass (protection.outlook.com: domain of virtuozzo.com designates 195.214.232.25 as permitted sender) receiver=protection.outlook.com; client-ip=195.214.232.25; helo=relay.sw.ru; Received: from relay.sw.ru (195.214.232.25) by VE1EUR01FT037.mail.protection.outlook.com (10.152.3.7) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1047.9 via Frontend Transport; Fri, 5 May 2017 15:03:44 +0000 Received: from finist_cl7.x64_64.work.ct (msk-vpn.virtuozzo.com [195.214.232.6]) by relay.sw.ru (8.13.4/8.13.4) with ESMTP id v45F3h6H026235 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Fri, 5 May 2017 18:03:43 +0300 (MSK) Received: from finist_cl7.x64_64.work.ct (localhost [127.0.0.1]) by finist_cl7.x64_64.work.ct (8.14.7/8.14.7) with ESMTP id v45F3gcb023755; Fri, 5 May 2017 19:03:42 +0400 Received: (from khorenko@localhost) by finist_cl7.x64_64.work.ct (8.14.7/8.14.7/Submit) id v45F3gfG023749; Fri, 5 May 2017 19:03:42 +0400 Date: Fri, 5 May 2017 19:03:42 +0400 Message-ID: <201705051503.v45F3gfG023749@finist_cl7.x64_64.work.ct> X-Authentication-Warning: finist_cl7.x64_64.work.ct: khorenko set sender to khorenko@virtuozzo.com using -f From: Konstantin Khorenko <khorenko@virtuozzo.com> To: Pavel Tikhomirov <ptikhomirov@virtuozzo.com> In-Reply-To: <2017.05.05.fake> X-EOPAttributedMessage: 0 X-Forefront-Antispam-Report: CIP:195.214.232.25; IPV:CAL; SCL:-1; CTRY:RU; EFV:NLI; SFV:SKN; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:HE1PR0801MB1499; H:relay.sw.ru; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; VE1EUR01FT037; 1:nNKoe98KQT40yYaGHREdz+w1/fZMf20sXEdmBB7/VB6FIA/foYukkk5UxH0wXdbjWTQE+4B76KlJLSMQwGH0FsfBEU9V8IOlVxin2JZlPAX34/FdsyUn+vqjquMTf3JzmP4h/+PxO7BxLBiKWVBU5WVOVGhqSi3TIgxgHwFdavGW2zxaLeXGD3wPyg0nZTdKY1nPHMiU6QAST5C7jJl9fkPYI4QdnkpcRxs6YH/rXEriWRBuFz1tYl5LckQFGYHoorO7hnYLnLHPYCoPG5UXkrNMZbMDrZUx7HvS9iU+J16Sv/W4jImvQngeiGnWg8+wFnf3ThQrQAR9RVgfjBojqDMJRypHk8paknDHwfFbpWVtMMd8LHA0C+1W+qd0kEmAAH/b3X6hdiDKmPSZHJ5j5n50jJ2A6MQ1zENSAuXT5Wgj/PQR4WIp7aW1KI2VX6PM27X/9kWomMHpc3gmSzNw+nRqxNxhwbvHKQjDtqIgUR6alFhJnc6CLmGjqLLo1HVkGf3oGzntvrGy8iwLuS77GA== MIME-Version: 1.0 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: d4cdeafe-5735-4769-76a1-08d493c7ecbd X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081); SRVR:HE1PR0801MB1499; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1499; 3:IYcbOfMB40aAhEujukWtL79QoU3YW42BojBsg5zwMh/HnCtM1Xz/0w6Y7TWRUN7LGUoZoxSuh/fD7SCbHz/MLEpJb781xIkvskLWqXZCA1W7//jf+vdp4LtyYvAeYxPkYS6nkNQ7e6sbe+gHJ14P/gVZfjGKItdSuNF8cLveWOgvcKsr0n9CzKmELM/l+cP1/hOnzqojigDA4DhNqi36eoDaTNFxe6rAz0fWfxGTrvWF+vLPNGFJeRhv9yfdCCDZunLXMe/X0TeO1R0AMGc23PBdU61QUmc3u963PJKuGh0NLHeiKxz7JD6jvDIKPIyKJi6Sec77jkIkA77PXSUTzRzztJHjhtcC4rxGdc3F1twD2Ly2m2j7xV7zygnLqdEKunca/TRnyRwjsitlnuowgZivMI8uTZzJkLYEZ/N7xMElI5W3lH4m88VgzH7JBbYZmvyM00FPT0ySij0/XQbN0XJ0zvQRAoEeRrzyfVJEyaFeJpbCo8se0xhZ4jJA4TJc X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1499; 25:iw92xDJ8XVguhXFu+IwI40MrjOofmmNfKCkxB1UW7pRlo6imqRl2jsT80EdN7uSIYg3+ymWMROgpP+Oc2FswzJaO6E9Z/APeLW4VsSHdVeP9mb6l1WTUE08O+VufW1dhBMfK74kOSdambtHN/fVo5XfNFjx4azO48DpjHc6slrECPmtpg6uBhqXwZT+mbr1EsGCsoiIXdn+2KmBY7vwB7RbSBZUeW6KDr9opA5Js25Wsc6E7YQnduQMW2wdSdkVhyGBy+fwwDbK311pJ0wC7GrFiJbYmYw1I+/igs2YCKYwhIuGAGZGCbdKMmMZFZIat7r6Fuq3GhAAxNDQ6oqpKE55oByp3/lS++3G4h5sP/s+3halR3IVSIiD7XF3JFdxQe4y4RBrAjV+8oE7XEAGnvDsCWFpcSQckVblYdInu1KO6Cj+cigJFf6UiI/0vJ3zxtulcRZcWoZZemaQtqQNoQWeglZOF+nHpk6dNt35Shcw=; 31:jZ4aKv580RpxxeYYfvSAKi39+2cC+MKC0cqAAcZ3oSxzpshR3MaE6b/a+bdVF7EohTpJ9vYbEuyPF4Op7Utw8BOvtlB2dh8cDFLE5aK/tVYkZytSfOepY44u30wUrGOSJVEf8vef206nztYLax54Bla6PuELxu/mti9+qjPqjeMDZE/k2sLJDFF/UKnwCiEyrqqhrzBisx1PGDHKTeKNf+K+/BeHe8B3xvtFLDqBh8ji1VjETjVOL2pZ0OEFzwuffp2V7nH1o0k2XK7VAdudAL9xnMfZkACnVQXBKObHGBmq9JbOBHv7d6gxiSbJjqaE X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1499; 20:z4GjPMRc3RNOZ9t1mbu3t7/wrA8wPrxjIjVtMnDkR2EjQSL7eTBGGdaJyvVdgUHY1TQim5Up5i53yoo/VaQPJbydcDmX517dOwKkO72f4QOYQ9XBMKEhmLlw2GeozeXl85gFF42W4DWZjal1s/DTl8lqbgxJEWvN8igmVGp9rXMlzJXT+juJMBXgSg4XerRD6jM4Ml6XKehzeYNxMPz741i+XpJevmIqdXjtb17IzUm/uKH6ZycE34JRL8+0MiRC9bvfpgmhTcLkjJtL7k1iyGBQ+pnJCZCrcISvQYRpZicIZhAouw3/NrllzLAh3xmIVn0SLQeKQG1FymKSXcwQmsfw1jNl2GNn3fM853RTQy9THTNRS1mqrfy5W95yOvvNTKGHIp3cFt6K1LNf6jKB1iyBBEC2r5JS95PSGfgYfuF+2gg0IpkVe4oZiXPTywZimAhaTn+1gP4bfGPRt3OSBjdC4Pd/NJclXq8lyacWqrzu5O2+er9jPV7Us5HLjHKO4O253/1Ha87rTzQuLf/kUA== X-Exchange-Antispam-Report-Test: UriScan:(215187933766430); X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101521199)(601004)(2401047)(8121501046)(13020025)(13023025)(13013025)(10201501046)(3002001)(93006095)(93004095); SRVR:HE1PR0801MB1499; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0801MB1499; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1499; 4:AU2Sgdlrw7dDN6MHcbWaw0fZ6ASjnR/sp5y6MGOWatzaP2aAjeML2M5Do7g4O9ItbHByzus1DgzON5f7icKnaIwe3lP6vI3Wn45aXfUHLYqT5RbGVlOrQ74B8b1JLqeWufAb6Bm6yG78BO9jZAXfUgICsyQBzJMVRBtcZy82+gQNFRoBk+USAtUemJFA+FNAsgLGvZWMVtpabzxE1i4X29bgNfu0wmZEm/S+FWVrpD91Jzx/pTAwM6yw5dBl/fxmS6fW4+jhXfMANRh1PZAKJya4aMjfjS5ScuoQNgPD3/hCV7oyR7q3l+MeYFrhh0OWL1eN8lquldlhpr+Y9b9fVwdKKLVWLtKWYosv0jYjjbXv3iWfDdBpqeSaiSX35fSVg7d9cMsKAOnwUfg/AqZpbgO+B4/SaGnsC1nrSvsD7/Va4tdQHOLYEfpaF7/Zp6K1HTNOoAmnnChes1YT/aM0Q1yAblCrishd2sc6Hu7Hr6BiiH0Y952vWvbiRH43qZ5mh6PfHrX86ZYMqo0jTxf2ilHgjvwfycmH1p/DOjuKixw=; 23:BpJqXweku3jPbyaw9gBkYtGQx/l7ZokiZ3lAKRLTMDCdLPzYW0MQrvCgpX2Wqq1KqyO78y8VJhbfiq0opyABieB/KjZEbILI0G802Bl5EF4mkVm9n0oAqeVyN8S4tkdyaC4bYSSiG3eyLVfrN/eA73CX9yXhLlr+X/cl+J+V4uBaKk6QoKb9otGBL67mO40d X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1499; 6:qHg0b7qOWRADuR8bMmU1lgoi3Cr4BsVHoyUyIzGElxI6CbuspYUcgKGFSjm47YUZBwBxFqTijufazZpzEL7EUa0yuoLFNt9sc/LRTny84Q2Z6JTJS4BZasnAm7KjYs2QghcIT6Wc2s8zTGOTe8e8DX5a3XabKnJVJq0YeaKwnjqzRB6A1SPnE6B1004VB7Pir8V2jrVQCqDvWVdgEd7rumQ9quNRlq1g4EX5at5ovqx6yj6c/NtzjioDXoGK45fDH9Xcc6C42hATsIHK2hQkm/l60yfDjlWdaXrVy9hD68sxrte5rm1tFtbXcoMRkUCGk4sQpVgOJHcHKCBRCghTN0xilWQysMYrGCZUyLnehgMWrXmhw6q/NraAaqzEO45ZztFkTaZ97kKHh3g+Xcn7hjan91t8kzOK/O8yDzuiyv9UcMxRhIdYTkSx5NATaAgb; 5:Fnb2qlroikuBP014a8NaPktyfMrvf4l6UUHh2Lg3oKwEaxxNsTDjZDEfUXiw134alOi1d2pvymNMmmsMka5+7qj7+Fw4p9MP6HFWlb0mJoIi/rD/abK/cgldwaS5SIpd38FNDWThU1WPz3bA0HwywQ==; 24:HcJHezLct/qcUnihl9KansdsoXPEfhaL33cXlwddEYRrCQt6sD3C7McK/RgWuoeMI2GgxaYkx0sVWsTEFEOooiiz9YhvIlV3msJcy0Z3M2A= SpamDiagnosticOutput: 1:2 SpamDiagnosticMetadata: 2b2090aae5154f77b71484475de18b04 X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1499; 7:m47HN7jDX86y9yHgI4e8i2Iww9ALFB8crgW1g2aAInbjaY3Uifm0EWTjxUlC3ExaBiBaUF9lDVjpLKZjIFmH2Dbxy5a4IRnHrKkinyCyvov9WsU+XXXcH/PmKl0aATkefEfuWYOWfkOBqzsIch8CaLfHLQy9v7pOJotQZeWJNYcPxpsECujnk/b2cyb3dlEg/vTuS51uZv/U4Za35amxifVz8S9pu5xJ7BfYjdUm8OGgIDOcMvIjtgH3FQR/dhPant2oDoOUY4Va6CzcAoem3b7JDXrepifn0sNCYQn6btWiEmHBuWbCFidw7whVjkh7QuGofuGSiItq1HkcJxXkpGn4uLMXugJvic9eUFmnbRarD1VuVpZ/EtUZ/azTAv+bFHzRGRgPYWQq+HtsgeFEzg==; 20:5iEL57yFMMK8VIbNjg02rnIK/FiSqr+Wc9rhH83MBjxqfMT1zsFKIEU+kaHY40qRvX86qDrKxe/UnE63H5WvpHkQBvXziVEllrMvoa98hWplMBego7ArY0xDAeTF+E3oM8b1BnITAfyPY3TnJZEmfU5C4vD8vVCRgGZHLsKMM7g= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2017 15:03:44.1790 (UTC) X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=0bc7f26d-0264-416e-a6fc-8352af79c58f; Ip=[195.214.232.25]; Helo=[relay.sw.ru] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: HE1PR0801MB1499 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 195.214.232.25 X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-AuthSource: VE1EUR01FT037.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Anonymous X-MS-Exchange-CrossPremises-TransportTrafficType: Email X-MS-Exchange-CrossPremises-TransportTrafficSubType: X-MS-Exchange-CrossPremises-Antispam-ScanContext: DIR:Originating; SFV:SKN; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: HE1PR0801MB1499.eurprd08.prod.outlook.com Cc: OpenVZ devel <devel@openvz.org> Subject: [Devel] [PATCH RHEL7 COMMIT] ve/sysctl/net: allow net.ipv4.vs.* in CT init userns 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/net/netfilter/ipvs/ip_vs_ctl.c b/net/netfilter/ipvs/ip_vs_ctl.c index 0d8330f..db4563d 100644 --- a/net/netfilter/ipvs/ip_vs_ctl.c +++ b/net/netfilter/ipvs/ip_vs_ctl.c @@ -3723,7 +3723,7 @@ static int __net_init ip_vs_control_net_init_sysctl(struct net *net) return -ENOMEM; /* Don't export sysctls to unprivileged users */ - if (net->user_ns != &init_user_ns) + if (ve_net_hide_sysctl(net)) tbl[0].procname = NULL; } else tbl = vs_vars;