Message ID | 201704221147.v3MBl2un027991@finist_cl7.x64_64.work.ct |
---|---|
State | New |
Series | "Fix VEIP object handling on container destroy" |
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); Sat, 22 Apr 2017 13:49:50 +0200 (CEST) Received: by 10.100.181.168 with SMTP id r37csp640024pjb; Sat, 22 Apr 2017 04:49:46 -0700 (PDT) X-Received: by 10.99.95.79 with SMTP id t76mr13170906pgb.21.1492861786495; Sat, 22 Apr 2017 04:49:46 -0700 (PDT) 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 a61si13240633pla.4.2017.04.22.04.49.40 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 22 Apr 2017 04:49:46 -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 v3MBlSUn032665; Sat, 22 Apr 2017 04:47:28 -0700 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp0241.outbound.protection.outlook.com [213.199.154.241]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id v3MBlPP2032645 for <devel@openvz.org>; Sat, 22 Apr 2017 04:47:25 -0700 Received: from VI1PR08CA0077.eurprd08.prod.outlook.com (10.166.137.45) by HE1PR0801MB1498.eurprd08.prod.outlook.com (10.167.190.140) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1047.13; Sat, 22 Apr 2017 11:47:05 +0000 Received: from VE1EUR01FT035.eop-EUR01.prod.protection.outlook.com (2a01:111:f400:7e01::202) by VI1PR08CA0077.outlook.office365.com (2a01:111:e400:c53b::45) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1047.13 via Frontend Transport; Sat, 22 Apr 2017 11:47:05 +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 VE1EUR01FT035.mail.protection.outlook.com (10.152.2.236) with Microsoft SMTP Server (version=TLS1_0, cipher=TLS_RSA_WITH_AES_256_CBC_SHA) id 15.1.1019.14 via Frontend Transport; Sat, 22 Apr 2017 11:47:03 +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 v3MBl2EJ012246 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Sat, 22 Apr 2017 14:47:02 +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 v3MBl2RY027992; Sat, 22 Apr 2017 15:47:02 +0400 Received: (from khorenko@localhost) by finist_cl7.x64_64.work.ct (8.14.7/8.14.7/Submit) id v3MBl2un027991; Sat, 22 Apr 2017 15:47:02 +0400 Date: Sat, 22 Apr 2017 15:47:02 +0400 Message-ID: <201704221147.v3MBl2un027991@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: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com> In-Reply-To: <20170421150427.31147.74342.stgit@localhost.localdomain> 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:HE1PR0801MB1498; H:relay.sw.ru; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; VE1EUR01FT035; 1:6/mpqMrOOGOgboLU+FMsCyaCVRa0iifY5OBE4PYlim2+H87muaFztn2Z2BiApznoJAT+53nQHBSZ/pQOwYVBojAE6xYdjSNXaDMsBMgoWEFJ5t5Og7POhNPmg3cMb/4/tSThzPqi6mAjgSxT99Tsh+XpSFwmhx0FJQflGrUIYFrpLN+jWtBniLZNI4fuNISrfOG5xVswofOiVt2g7dQYldePynxpquPNUl5C1WYo4TCUeLGoOgduQ3yHARt2tjVmPJbZZtxZDejBVijU6bRt+RzLaYdmWJUVWVvn2JfM4uuZPJ8TP5ZLf9uZhehegbU7hbkl2N03Qrrp8bG+eJyrq8So3/pMd8rBlhwwUTkYj7N6qUK3l97S04xRd3DxW47ZjKg1dEcEdzWUIF2cRKiQL8UuvK+eqjHsTwdL4L0PxHueZCpd36pF7bzbYl65DVdjTR2jqOvm5g+Rg2pPFXB4YhO7iIyhyhoBiUc0NDrkxZrpij6PbwtAm4JPQLfruTOR2uCt7mFz/z8dD+9Aux+Ujw== MIME-Version: 1.0 X-MS-Office365-Filtering-Correlation-Id: 3df2bd78-33b6-4d80-8961-08d489754be5 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(8251501002)(2017030254075)(201703131423075)(201703031133081)(201702281549075); SRVR:HE1PR0801MB1498; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1498; 3:9wpYgruca/FaSgYzoRgaooH81CRvrFXZgrT9e3k7E5t/tZE3g4ytbE0rRU1KbwUYHLvpbaLkdT61C6D03UjCQ9OeytdnZ6m2jV1x7aW0Wo9GlAImvPzp9QTFSh8tQBE7fqJEfnckkv7zDH46InOv9N5EqlWoAw4yltH25uoXIx4xuJKHQsLaaKVpjPPTjo8tej/PLW1wJQRqBjDCfox/5WGyDJ2koYyr93YjGOVoZcarLh2Tuv8lktBfIqDOuaI7q2fU99WMZwNfBrhRqvVZchN3yeutkQ7heIp1/Nq9TbMExcPfGDAK+RqtN3BLLKqoHzj9fhUOtv6agM/iQ5+fQF3oLpJBEWmx/GTnWeqN92Fj3VfOguBqu+409MvSoTSzCM4DfemvKktxFt8Z/xczD+lEU5tF8bfQie5EP1uo2B5L1lh9qHzIcVPJPOdCSdzlIlYwGjplz1LM1mVqr34ymRFLOVCnj01p1TznMbLPyWlIT4+hkb5pMvvJKfg5kdLqyJXRSHjxOViKmdcWm5Yg5Q== X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1498; 25:PjCemmNuNpjpsOreSVS3TdHbBogPRZ70QO7dQNYBvisb8mUxpc1ucbsyKcFMVtD8AY++VMci68GmOpLd09XlOHRqnhs7SdABHyBmgeXbM9kS4/eFsBXa38S76pGDHDeM/OpsVlLsF/cR7CDCDLUi1izk2JGRVrk/BrMmE8QkmVOV3FMvVJK/WRvYq0d1RsELFRinN7QsOTr15neVBocN+mBRakiGWBoyXDUlOPruv+PDe5VrWkdptugXL3CehCzDuPym8P5Wb3Yh9y+RK7wpd9VN32THXUyLX1RaKYC5/8Q0bCaWto01iQBTrq0MxKFUrN3vJ47M1bxQdOgwU3URYVNU8Uae7XBGWMBLg3i4BC6CnOpoj/tr+wMaX6XiG5qBn5FYJGIKIHdhZfoN5J7UY1KkX3BNRTEtEMf/O+JqXGIVfOwH2/6jMFt4djZlTGpgARt78IMwtscmR5mGWQG1kw==; 31:mYOmeMhxrFjKswj9l6luS1OuHWOkxTDu/OsxByzZ5Z1BRaETlLkANaZhX8NZjvqleA8VoOgREqmiQ2ottUtew/Gmc90XTBNL+/Cl/X48hxlnJXRy/qrzXrpKTiBkfIOw5D35AmJmvGHwadV9S3cB3nDxTOeYXM9uSErCTxsvYJ/l129ddL0rHPuS7Yv6ANrWO+QcVPbN26jyMmsQ8U9rGk1WLqgKid55Gvi9J1nCm99nycGGqX6dKfHjlv/nCknVMHQ1DDDMuQxVrrNJQsfVceVuK7Ylm6Gay0rmnKBsyFtpHek2ZdCTBnWzvbOGClcW X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1498; 20:btbYpbqzVqFXS4rSrRvLjWLGh3KhPMEtbqiWEULF4z/0qChPF47eY9EWQlmxjzLqA2/1cfk6xHSWED7zYdrEB6A2gk3WzC7aZ6meUFRZGBloq5YZ/L1t6wPaT6C/pJs9MevCvE7T+Y51iHpNCLeygEhMXc75RKMc3b3amBo3Z3dqAmzxCEYGe5bVKIZgAJ6JauIWCNFUxg9nvCPTatFXmjR+Ke6UkSb2Fxh6M6bPqFotSUyYQ0eixQUlgoXTA3riOLaMGB0fgmETjQWrYLDdx4ZgVYlL50HHSxabdKo3jIfo9FM13+WRxCoHD6ModcC8ZcLNgg0yl9CtYuBa2XfzmvaOfrbCIfB0NnupSQtMJonCUV439N2LmwYD2g8+hcfk+wbE9sgkrtpb87cgMTXq+eKcey4zFHltYzL43p5xJ+UQKy3IZ5xrsUF8o5rCqYmrJFgZKjVbIBE/j+va525hcjVO5vCtJirfEZTNfP4a7Fgk5JlduxceVsVuikiFgcNajw9olsHjU7dy5SHs3zrySw== X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101521199)(601004)(2401047)(13023025)(13020025)(13013025)(8121501046)(93006095)(93004095)(3002001)(10201501046); SRVR:HE1PR0801MB1498; BCL:0; PCL:0; RULEID:; SRVR:HE1PR0801MB1498; X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1498; 4:E5fE16txPftHlfWS4jZ0d5Sw5LRe6PhgkUG2QuRjOBFHxSONuMHmwOwuhvWF13TKQ3NMmtB0B5hgWfUy8cqi6HVA+RkCNweRtrPJCsAKMom+v1qt/lyeRUYs4/ifgXEaoFKT7weJngr4f6QdS8428fOGEPMDl4XA6ap/ab+Xj1dof81cw60K6kIqELlxg6I97wXgRyL4vOGcYT51WnWrcCUTse72dM1iItUCCCnzT9zSkINeAagio45gwP0WuuMPMoQzngojfW/dTI8+LMbaLOLf7pJR4mQE3cgIPEvsi4FBBp0Vq8RIp06O4voI7hjfVnwOAGjTLZWhNi9WpiBPMDStlsqq54V387Xb2se0rUmcTl3tZJElb932D56XpWujk9jq9W4HzqKaY5KRWrU1ByqpNhOiPaGsnvjj+asezmWlqQ4qUhhRoYQv5dqBa7J7QsxkSU69A3GPRQCn8Kh8/ghNsy8Zn//x8MSLSiqGifI=; 23:gWND4Sq4IFTxRQYW8M/vOUooqVhkBaRiY8C2hDtLAZjMorHHZrzWet70oCCDGQKBt+DC6dSnb3TrfC0mqnqHo4LkGvk8BsyT4mcTI02laBKCHGoiaSPFOIQnD1TfARr3ENu1ouN1/1ve//HH0lEe5gClpRthlivxuPGXJmO+JYrzTvS+HGlkPE9VEk7mbjbc X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1498; 6:aM7N7IQZ8Ag8BHlEayImIJOemxRKCHvA2ChAJMHU9754hN6JHDhgYLJ3Wktxl1RoIN30C0r1wD/Ms5+8DYY+71x+rZt/EWyZ49oJaSWyK+iT2iDgwRsbUjieRUebcwdNpxv8db1R6u7/4jmsrwmfqeJVzGHYdk0cFxKbn4+UlViJW92QdfF14qJYectJ4Dxr2bu2NmBcKvI+PV5pVa21BVj7D9RGcG0FTYzcsuvCuJlrt2AxabXlmzD4w2iVxfCyLngXpEQgsYDpkMvVhZtvEShCgyyiixCve6uvQnrdhpXXAlZY5/k1zHPcbLlJ+CD3XAjubVs4/kMHelWAVavBn0HNf1fdBvRSkGZ8E52K0HcVxl6DwO268nlGqjSUA3QHqxNj8VzigBneunZDFXvIh8pCz8eYs4CexLgJZgJvTyjwZRncAF+PpxysaftvqCns; 5:xN1sFhVoHLWL8vlfFm39LZaRUmU8v9+jYUD8zzMW5vpZ1tj8NO4He7lD7XHn2ibxBvd50G26+hUz2up9w4huZSt3Vzy59etJ8q/e7siaRFhjMVvjZU8mx1l5GDJJVgJGzp9/ZKqBam24iFUbAM7FahjxrKRDdL0palTW0SjJBfs=; 24:TjUYC4Jjk5FM4ODtyTAxtnWc2fyhaT89WJ123cWyv35vKoOymNCYVjUuN/ergLPZhBil/8vxfcaijCCvGU9sS5Y2e7Ny1fWtsVNzxkIMFic= SpamDiagnosticOutput: 1:2 SpamDiagnosticMetadata: 2b2090aae5154f77b71484475de18b04 X-Microsoft-Exchange-Diagnostics: 1; HE1PR0801MB1498; 7:nSpaBiC7upwguDA6oz7GtFpyt1adxOAPn/f5yn+xL1v9MeYZuFxa/qsDXlyFneUchsnaTpqbMUBGbCNkvdzjGBKmYme7vq1A0viZhGz2Fiqnyo1dsN1mHk2k+hwUYbcHUS5CUCRYc4DV+nSAe7stga2v99SyljfFiY0Rn4C99nuCre8GxE2bIGBGdf9NLSMcWhobA6cX6XOAUPTQV5NS6V5M+NamJpUBiCHCdsxbymodF+M2suEdhNB6kr09715yo/7nLIjibSPqkBr/Eb3ufI0l0RoXj71ncAGLODm2uGU+pARYdfbc98q02aBytOETz2KpRbATrdxpzhTa+fFkpqODIcF9EKcIroJvibfp5CeM2VB86eCRhQjAmZ/lMgSu6jIEtAgJcjRcXa06LHaI5w==; 20:FWQHMWgvVzb3DpqGDXWe05qwxkqJxmQOjlW6GYhCbXi2I1SFEKAMMckQJNvoWFarxxyUKgq0MACWZs0jQBU8eeiPacnjVWqqOvsARfl8OV1kbqCm0xi9sk28yq2mnwA9a4DBWOYe5PLaynIpoI4h4KuWGAPE8h9QPCrbfY5Byu8= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 22 Apr 2017 11:47:03.6251 (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: HE1PR0801MB1498 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 195.214.232.25 X-MS-Exchange-CrossPremises-SCL: -1 X-MS-Exchange-CrossPremises-AuthSource: VE1EUR01FT035.eop-EUR01.prod.protection.outlook.com X-MS-Exchange-CrossPremises-AuthAs: Anonymous X-MS-Exchange-CrossPremises-AVStamp-Service: 1.0 X-MS-Exchange-CrossPremises-Antispam-ScanContext: DIR:Originating; SFV:SKN; SKIP:0; X-MS-Exchange-CrossPremises-Processed-By-Journaling: Journal Agent X-OrganizationHeadersPreserved: HE1PR0801MB1498.eurprd08.prod.outlook.com Cc: OpenVZ devel <devel@openvz.org> Subject: [Devel] [PATCH RHEL7 COMMIT] venet: treat presence of veip object with the same VEID as error 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/veip_mgmt.c b/drivers/net/veip_mgmt.c index 343ee7d..b45e411 100644 --- a/drivers/net/veip_mgmt.c +++ b/drivers/net/veip_mgmt.c @@ -42,6 +42,8 @@ static int veip_create(struct ve_struct *ve) veip = veip_findcreate(ve->veid); if (veip == NULL) return -ENOMEM; + if (IS_ERR(veip)) + return PTR_ERR(veip); ve->veip = veip; return 0; diff --git a/drivers/net/venetdev.c b/drivers/net/venetdev.c index a4388fd..192ca3c 100644 --- a/drivers/net/venetdev.c +++ b/drivers/net/venetdev.c @@ -221,7 +221,7 @@ struct veip_struct *veip_findcreate(envid_t veid) ptr = veip_find(veid); if (ptr != NULL) - return ptr; + return ERR_PTR(-EEXIST); ptr = kmalloc(sizeof(struct veip_struct), GFP_ATOMIC); if (ptr == NULL)
The commit is pushed to "branch-rh7-3.10.0-514.16.1.vz7.30.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git after rh7-3.10.0-514.16.1.vz7.30.4 ------> commit 1fb40f5a65abd35823f794928d9c62fda2bc604f Author: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com> Date: Sat Apr 22 15:47:02 2017 +0400 venet: treat presence of veip object with the same VEID as error This shouldn't happen. VEIP object is identified by veid, which is unique per VE structure. Signed-off-by: Stanislav Kinsburskiy <skinsbursky@virtuozzo.com> --- drivers/net/veip_mgmt.c | 2 ++ drivers/net/venetdev.c | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-)