Message ID | 20180912234115.20736-3-avagin@virtuozzo.com |
---|---|
State | Accepted |
Series | "criu: remove all magic of service-fd when it isn't required" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [74.125.128.109] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Thu, 13 Sep 2018 01:43:25 +0200 (CEST) Received: by 2002:a6b:25cb:0:0:0:0:0 with SMTP id l194-v6csp6021820iol; Wed, 12 Sep 2018 16:43:19 -0700 (PDT) X-Google-Smtp-Source: ANB0VdYPSTJ9QvVPMpOSfIsYplVjvdWqlM/fO0iBJbKiwwnijmzgSokA/paH4f3DivPm12v/bnAg X-Received: by 2002:a19:9bcc:: with SMTP id d195-v6mr3081183lfe.123.1536795799211; Wed, 12 Sep 2018 16:43:19 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1536795799; cv=none; d=google.com; s=arc-20160816; b=WA3iHrHxxcxIEF9MO1mgyix9lcx531dOm2S9ceXgUwojNLTFse7mga926Se+HcIw4M AlTfDVauJOFf3sQ3UNNH73Q9E5iTI6/TF1DOgOQlPSf9cTvHc6LfFA2FaQG2i/boYs0u HWG+rypw9apyXqz0pQircQgdScRqhBAt7kxKBGPo1eOS6+I4okrU0eaexGrptI4H45Di KomzFzm46ODEuKsYpNVUlghDvL9A9u8l6mwYdPt+QVz4fbnh+VbqeQTxQ0AmadMijRke z9AlRNfjHFhfr7G0BJ46iq0iZXuAsjKvp3lhBed1mkiLjhEJRNzRx9OatdS9Z+b9DETb c5WQ== 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:spamdiagnosticoutput:mime-version:references:in-reply-to :message-id:date:to:from; bh=qIN48V1mR/Ykkx2/Huak8RvMWR70Oe6CghH76RNSUYM=; b=YebqUtR+dPs64qkruZldueo/hSZI8ERAJv+6hJja1tO3/2/VVf5BPKREtPYdVZq3Ru LgtsqNuDNFaEc3dAdhfMp2OL0/tbrfv3J0wGaJ49vyi5K98U54hEwJZrNhvRa3NRcHcz sIZpM6isaK0YFP9btz9nIjt3bBCK0mvhnIXTfM9MnCXFlL7HBoQR2/GXLSxBxssiZcT0 7yHUDml02RP/VzfMtuGzlgtd6SIJjA98UIRqtlPGSyPpipeqCDQv40LO68WS3GIzEfyi w4ZVh8+oEL9LKcgX/Cg9rMznNls0g5lEbufBRJzsixQAgj9no1tjNRPfdFdnRsdtdqH+ fEAw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of criu-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=criu-bounces@openvz.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=virtuozzo.com Return-Path: <criu-bounces@openvz.org> Received: from mail.openvz.org (mail.openvz.org. [185.231.241.50]) by mx.google.com with ESMTPS id c15-v6si3203252lfe.3.2018.09.12.16.43.18 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 12 Sep 2018 16:43:19 -0700 (PDT) Received-SPF: pass (google.com: domain of criu-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 criu-bounces@openvz.org designates 185.231.241.50 as permitted sender) smtp.mailfrom=criu-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 w8CNg1JK007419; Thu, 13 Sep 2018 02:42:01 +0300 Received: from EUR03-AM5-obe.outbound.protection.outlook.com (mail-am5eur03lp0116.outbound.protection.outlook.com [213.199.154.116]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id w8CNfTPl007381 for <criu@openvz.org>; Thu, 13 Sep 2018 02:41:29 +0300 Authentication-Results: openvz.org; dkim=none (message not signed) header.d=none; openvz.org; dmarc=none action=none header.from=virtuozzo.com; Received: from localhost.localdomain (4.16.175.162) by AM0PR08MB3251.eurprd08.prod.outlook.com (2603:10a6:208:5e::20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1122.15; Wed, 12 Sep 2018 23:41:31 +0000 From: Andrei Vagin <avagin@virtuozzo.com> To: criu@openvz.org Date: Thu, 13 Sep 2018 02:41:12 +0300 Message-Id: <20180912234115.20736-3-avagin@virtuozzo.com> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180912234115.20736-1-avagin@virtuozzo.com> References: <20180912234115.20736-1-avagin@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [4.16.175.162] X-ClientProxiedBy: AM4PR07CA0011.eurprd07.prod.outlook.com (2603:10a6:205:1::24) To AM0PR08MB3251.eurprd08.prod.outlook.com (2603:10a6:208:5e::20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 65929e73-4175-49bc-4dbc-08d619094553 X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(5600074)(711020)(2017052603328)(7153060)(7193020); SRVR:AM0PR08MB3251; X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3251; 3:pa/plc48Zk24OFZIzikslMsWcJoJgmXmHMZdzHCWYefhjPm+HvsrrU26TMylMy8ltkzME7lViUcnYfq4X3kGERTX2kwrQelIyKKTxNZwtuO3ainlDhsOQBKUHCHHk2R2Ig8oI5/Zt7ZTERiozvmfhAHjp4pWQj/vR7kWlgtzz8wvWzUZVF6yQEIRyKZLAOpwfs41NhaXsFxu9lTZht3DDqUCCRDWUW1Gr73zpORk/JUDRfAlvZyLGcq5O7jVjuuZ; 25:Yq3BL26rklgrjvwyKUZ694+V0r30UGimefXwZj3tYMPDk+GBbd9tpEjDTtEhRvCuk2z/VvB/+M4lti9QpPZJa6a6Jn8chPG+aHMm1UX6ZmucR1IPWYYa4bRi26tsjrfEn1S4re8JXePoggdSHpE9JU+xFhjR8VH6iWaW39OGvSbzZpfCPcL+kIV78BWQJT72KZ7hSRtkwok3SaDH0Iyt1uI5Tz/KBDsiypOsx0kTPXk+5xSxOY8lzaNW8I0/N26NKyBap6LpxI0hHzr3+fD/wXOcKGHYa+duaWNM1ve4F8BMm9HbZGRGNE++p8Hjjso006s++Ql43TXEQjH7rBKBgA==; 31:98o2xr/omAq+RCtAx5nPDYQ+i+04yrModNwJ1mSQ1q9hkrkqkVR6o3WwIQgDXLfSCVuK4exgZzpltLTo9KlNO6xVtg9tt6SF10B/IzSbPbQQygRa9T1zM4WZNvRFKVgmNmyyZHvEoX6NjAiNdD+ilp16nSj3lVJtQn5qwCLswLg87sVUpKPsNotg7zunKi/RB5maQ9hrQ4dS/zls8XvAQzPSa37u+X/LUw0KqCF97oQ= X-MS-TrafficTypeDiagnostic: AM0PR08MB3251: X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3251; 20:j/Dul0iwmLp27W6qwsMs5PdpPvlxfhJB4mSGBrqZvEtVh1hsP2cRnwVEwKFK5yVdIIoA5MGMAgOmgUtJJi9m3oBYZEUGbYVXElzIlzeoQZTsOMnzP5nJrQxuuAJGD97bO6Dj0eAKf7YPjFEqx/BNUTrEFCr2nbRjzzG5FdFUcWxPzUHmoCQ58ex5/0QpEAR/wXeBvrP4wBG/5fskS+3UEAlBC7tei8BVpCWzBA+2TftipyIK3nf7XWld2ZKTf5iLfc6mpB0PngJj6AReKjMFyNUdG0oaBeUQf71DjLegexnAwik7Sckpl2pU+BwYp88VKf7xopZMA8IzXw/H1H6AXBwgeIrIOKQTCPHDYFrjmFsIUNEoL+CSRQWYkrfnSV6Q/hRKYGAAFPvjYUqMIhGULGfDffo3uE1f5Ayp2DRHe+YxGhyWK+FPa0mPhvVoyBcjEj/ZfyCxhYyt+Y5e4kLbJ0slwc7CbLkxmubKCC7D0vFj4JDTm/pWfK17ebQ6Tk+p; 4:UeEZ8U73ixaxC5vB8/e9xZ9fiyqcWnUKqihdGqja5xQ3Jae7xyDGF31AlAcUqfLCNynDZUmVc8Bwo7GpuEYGOh/BoWJUZzYf1QOJwFbCiMu61Cma5j7f8x6DcB4ySx7PBbG3QZ/nAmxXNjthP8nX1jKSnWeHq6fh1APo95ZTe7KNdYLuqUKFm7QVDCeUL/PACGKWYgp6hfptiA6JnQuO6f3hdVhDW0/f/mzf3xL3RF7+H7EkQ9gskfVkFYhSGfZo+e4qanpxR003DUN7VfeQLg== X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101524173)(20180801055)(2401047)(8121501046)(823300264)(823320095)(93006095)(93001095)(3231311)(944501410)(52105095)(3002001)(10201501046)(201708071742011)(7699050); SRVR:AM0PR08MB3251; BCL:0; PCL:0; RULEID:; SRVR:AM0PR08MB3251; X-Forefront-Antispam-Report: SFV:SKI; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:AM0PR08MB3251; H:localhost.localdomain; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3251; 23:gSHwEnXfWsreQ6PPVbiQ9lPh5oGPi5r8OEJuDGXLp8G5x/znP57ksP1bZ2RC5z1myFgC0Pe+9ivoIJl6Kd1vAs10279vDgNQpZrRZhlcRBe/hcXeuVUr0rXt0dslD/iwg9y9XIzxCgf6UYOi0lb4gg==; 6:Yp3zSt1RLn8MlerQe/Tb/Eobzv3IrP/wtmKAJtCVdsmWJ3BFBIJxg+/uNQ43D1rDvSqr7vodz1FK+aR+hA4KCoXwpcaRn2GrI/cSlCzxZIdV/C/uEqWHjyInYnpKpqM7cOZbSbB+RoGfV4MefjuPrn1qoRxkVzM5LyYkjvJ4NOhXYK7pJgK9kjDqWS1SAwGa0m5r5CSOptQsp/jKkOPmQ72hdjk15Hp4zDLvx/zw3F1uHWh4wtOI5y1GpWXwrVkOB2Kmsyas7iA0+c7Z0GzwcNbtfH9na7CtyTR9C9tTIlTGdIPFuj+qhqBsS90gytEfzoMenYtEa4c+Inb1h82z69A/i8t2/iAD2/vK6ItcjQgpwr+itHEyglYqiwl3boAg2W2IBoPLt7RIsQ8qrs+n6bNTCFIL7HQe6l+KRMDVfIHrBeF2zTue/2DiwgOlcuXW+t/rG6GSy3OdY+KUfpyniw==; 5:CzvtZkqHlFRrR/SgKJVzzqSgphsPF7k1El2geOrackaPFACDircDRsOSto1LOkdTlNhAyxuy5IggghdWVdWp3ZlTT4LpNEkNLq/J7IpsFQBYJSRk76+UzTh5OErw0qBr/enkRhE4CCvpyIAhZPHbJiznBwuIaXWFc3bos1LvCRs= X-Microsoft-Antispam-Message-Info: tgf7XCF9vw7Xi5qxJjNt21LMOOdBt0tua1UgbnQLacWEC0lZa3O7wQ2Gx3axabMVq1hMEApZ2dPC7dk+m6BTY7tmyznCy7I57OnPeIhkJLJbNknb5oswMTN4i7odSjMBQ0YkxIYL1DX5VQSc8TAwlBfMpi0OAxWLth1Wsz5eu97iN9yUQMC1RUJx+FGQU9n6WRDV3uEI8Nqoi4ZLwcB88Ws4siNTMQEIuORC6BKUed4YoBOBcd8Zx8Vfl97KPNuVPzrDm9tMTqzWDplApJpmW50fjqYPZA1lVKMFKN4M9JxnoB1RLjpOM8Mcat7/Z+dgzNiFmzwVKfioe8pm08S/AC8iTfFwbmGd4hyBEEq/OGM= SpamDiagnosticOutput: 1:0 X-Microsoft-Exchange-Diagnostics: 1; AM0PR08MB3251; 7:FUB06BkSZ7/I8fSjiWpjxM4Uofgohlk7tQqjLRmdHNpEOP3lF8GRu75n4iEs90c90ywZwaUcPCoR413fJb3+TmXdFrVuxjwZgUp9R48PFb7fPwJJIqcTygn4cj56Z43Lmy53jQdU8juhPIYvoZ9YMZ70AE8ssGly0OBZI8T/I4YTlwJg7iQazJ2dyorMpggLRgTORGRU+/+clEYTr+i16AuQMYBFCDjyWXtXUexJYh09V7dfc+enpmSZ175i6NsH; 20:0iaTEcIcjoFhC91AX1Dyzon6kBZWPeJ101PAK+C0QhQhRwMT0ZaHqL9HzWqThfhmgt1rBXT7PTWzrRMKvknGnvMyuvIEOwd9U3vNwZWGLF3mc2mQIKv2n+IKfSXluIRF5on1XFANe2V4GZxVFmcBd6H8zIxrBvTmggQdK2Ut3NU= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2018 23:41:31.9397 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 65929e73-4175-49bc-4dbc-08d619094553 X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3251 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 4.16.175.162 X-MS-Exchange-CrossPremises-AuthSource: AM0PR08MB3251.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: AM0PR08MB3251.eurprd08.prod.outlook.com Cc: Andrei Vagin <avagin@virtuozzo.com> Subject: [CRIU] [PATCH 2/5] check: don't close file descriptors in check_user_ns X-BeenThere: criu@openvz.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: CRIU development <criu.openvz.org> List-Unsubscribe: <https://lists.openvz.org/mailman/options/criu>, <mailto:criu-request@openvz.org?subject=unsubscribe> List-Archive: <http://lists.openvz.org/pipermail/criu/> List-Post: <mailto:criu@openvz.org> List-Help: <mailto:criu-request@openvz.org?subject=help> List-Subscribe: <https://lists.openvz.org/mailman/listinfo/criu>, <mailto:criu-request@openvz.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: criu-bounces@openvz.org Errors-To: criu-bounces@openvz.org |
diff --git a/criu/namespaces.c b/criu/namespaces.c index 24cd61e2b..96cc2f0e5 100644 --- a/criu/namespaces.c +++ b/criu/namespaces.c @@ -857,7 +857,6 @@ static int check_user_ns(int pid) struct __user_cap_header_struct hdr; uid_t uid; gid_t gid; - int i; uid = host_uid(0); gid = host_gid(0); @@ -900,10 +899,6 @@ static int check_user_ns(int pid) return -1; } - close_old_fds(); - for (i = SERVICE_FD_MIN + 1; i < SERVICE_FD_MAX; i++) - close_service_fd(i); - /* * Check that we are able to enter into other namespaces * from the target userns namespace. This signs that these
Do someone remember why we are doing this? Signed-off-by: Andrei Vagin <avagin@virtuozzo.com> --- criu/namespaces.c | 5 ----- 1 file changed, 5 deletions(-)