Message ID | 201806181006.w5IA6tN8020775@finist_ce7.work |
---|---|
State | New |
Series | "ve/sysfs: handle NULL sysfs_dirent in sysfs_next_entry()" |
Headers | show
Delivered-To: criupatchwork@gmail.com Received: from gmail-imap.l.google.com [74.125.205.108] by patchwork.criu.org with IMAP (fetchmail-6.3.26) for <root@localhost> (single-drop); Mon, 18 Jun 2018 12:10:10 +0200 (CEST) Received: by 2002:ab3:4016:0:0:0:0:0 with SMTP id m22-v6csp2982620ltb; Mon, 18 Jun 2018 03:10:05 -0700 (PDT) X-Google-Smtp-Source: ADUXVKLutIbhRaCDRB4eG0YC/oc6KSRaH4MDd/2+YLLYmM0i/iDvYBTAF98nZI9CnqMkk2fgVPLK X-Received: by 2002:a17:902:7048:: with SMTP id h8-v6mr13373720plt.269.1529316605353; Mon, 18 Jun 2018 03:10:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1529316605; cv=none; d=google.com; s=arc-20160816; b=GHdivBhI4yF+4Hv6UzaFdW+VjFxSycrItAmFHqVkqIFLaIRCEwIwpZOAp668cKOa0N uh2bQbJQk4typjriGiri72MgBh8woDvOxRJ7hlYBkg9kTYvZYDFQ3hk91diaIAcW7bEm +wmyiZ3kN6mN5ZClpGXVknwSf6fEKcl3HxNjXRQBR5bR9cuGU6RRuWvoyB6whfTJDRU6 ThmPi7zIwh5HGqFcwJIqwx+wNHyg/JIq5jJfgCulgyOxxKvltatNIpIAD0V0aX8rARlF CbjtgblFhaqZPePrzRynPgfZuzc8u5NiAAAIh+Wrzagba379gljAChdf42cc4q78Vjv6 PFRg== 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:in-reply-to:to:from:message-id :date:arc-authentication-results; bh=usrZuzwlskdrkiX8Dye/IUMpgdIkdNhaEs8uUBgIqxI=; b=n+i07FWaW6najAvcVgA79goqCK8BNyFVl7yilpd2o1j3C5c5jC8xWrX6iSJgkMyuCx x613xfvs4dIh5/V2c3QbqUy9hAhGDJ25774FblesjT3x7Mo1Z4SHbr4mtzV16GmXhmE1 0p1JGHpsdqEMjBNOC8+XaM+huQRj0FU7AMMG4YP9YOTWM+2/6RLfG/Cb82vkh6LMW/AT q0teUXvQNTA5J6zJVJgAowPNGIobDCR6H2a/LZYNTd4dM4b8nvA0ZNgdMoCHy/2/MHAF nZZ0K7IhYY40lWsTHHSbYSPTH8/2hIXKdJv6nJk6O2FK1g76qd8WplwqB2RrRvnNNyl6 +D0Q== 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 g5-v6si11849305pgp.91.2018.06.18.03.10.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 18 Jun 2018 03:10:05 -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 w5IA74sL001541; Mon, 18 Jun 2018 13:07:08 +0300 Received: from EUR01-VE1-obe.outbound.protection.outlook.com (mail-ve1eur01lp0244.outbound.protection.outlook.com [213.199.154.244]) by mail.openvz.org (8.14.4/8.14.4) with ESMTP id w5IA70UR001538 for <devel@openvz.org>; Mon, 18 Jun 2018 13:07:00 +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 finist_ce7.work (195.214.232.6) by DB7PR08MB3115.eurprd08.prod.outlook.com (2603:10a6:5:1d::33) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.863.19; Mon, 18 Jun 2018 10:06:59 +0000 Received: from finist_ce7.work (localhost [127.0.0.1]) by finist_ce7.work (Postfix) with ESMTP id 96F8B66185; Mon, 18 Jun 2018 13:06:55 +0300 (MSK) Received: (from khorenko@localhost) by finist_ce7.work (8.14.7/8.14.7/Submit) id w5IA6tN8020775; Mon, 18 Jun 2018 13:06:55 +0300 Date: Mon, 18 Jun 2018 13:06:55 +0300 Message-Id: <201806181006.w5IA6tN8020775@finist_ce7.work> X-Authentication-Warning: finist_ce7.work: khorenko set sender to khorenko@virtuozzo.com using -f From: Konstantin Khorenko <khorenko@virtuozzo.com> To: Vasily Averin <vvs@virtuozzo.com> In-Reply-to: <778b98fa-cb1a-c389-0af3-518a0ba48243@virtuozzo.com> MIME-Version: 1.0 X-Originating-IP: [195.214.232.6] X-ClientProxiedBy: HE1PR05CA0161.eurprd05.prod.outlook.com (2603:10a6:7:28::48) To DB7PR08MB3115.eurprd08.prod.outlook.com (2603:10a6:5:1d::33) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 4cfdf54d-eb3d-4961-4753-08d5d5033b1f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(5600026)(711020)(2017052603328)(7153060)(7193020); SRVR:DB7PR08MB3115; X-Microsoft-Exchange-Diagnostics: 1; DB7PR08MB3115; 3:6jQaNWB2PeiJJQaO12QVccWiTUzNajwT5fJNBWYx/PDza0W6VqTirvJtLKbRjFuKh5kwMLnBTsfEADEC/CtKa3q1ab083pGyV6c1EeFYLnW6uaz3cTlIK3Y5Yv4fh7PT6mUxMAg4+7RGhaBgv97uwIikNV21JAyLg12zOkj3hVDZvX6+SceHIiRjsxKkg+NPKXkFGOOZNLH7dnrDOYeN/6YTH3tB0bOhDJiYlwoy5xiwIZkAvC2EcaYg3ZDdsY31; 25:NMXjVy5beUgfR2+dDmen7C1LajnN9eGilLpBYBxT0uukVVt/uEGLAg8thAxnMmX9f7QU+IAz5PbbMUiwedhypCtYrKbpTXpAeqyGgpI3U3YMqhdvX/AjW3WIn81kKeJdPgf0GJ9k/K5SaGO0sGwVTMpXGRYMzyBnBgZG3qFPNc31ta1FMaR+kn1kD3FuVgCTjBvaRFKh3gpGGmcNRIacrIkMkCjZOrmoVpKJ7Vd/lnWLegqJSX/wlj1hdAecxISadcmm0Gb65QvpytnUm8SVGbABquHVhGC/ACo9oNFtllcJX/ZQPig1IJpMMJiPMZ6hRzFKpncgKPdowxgg6ZzU6A==; 31:uFfFkmzrNW+cAYWbjL60syn6LJkKt0pEn82wHusu6+vXUy0LLB6POxEYAbpTxvNubmDyRYa9QctHkw8BUUrdrEH1ZQ2yQXaaKlEbwMfIdnBqmZqVBRBOypOPJPnbrHQAIXqvbQMh7ZtSLAFWR4r8H+Zwt/4IzAQXLFCMt6a+YNDJAM+GyR+C60JbqDKLSEo+RxFxU2exLh71b1jIgNPlvN3JQb9GqE37Ry3cC1eG0b8= X-MS-TrafficTypeDiagnostic: DB7PR08MB3115: X-Microsoft-Exchange-Diagnostics: 1; DB7PR08MB3115; 20:x3idT8tXE3rKtG0PDpif5bFI6VeYkRNshVxK6LhdmIoazfwSPLJxfVnnIKn+AJmVJno9bSmVGUURPUYVlnOaE5YtSJ7z58YHbJpuEBk52kkiFvUI2z+h97anai3VqpZZ43Y8VMTu/r1ptufBw+BSvAhNj8RFKGHrjV5pqE9XDORNXhyJLC7Xqs6dwpvBEXkGxhp5kMT5K8dNStgULlYn57+24aW8fH0W132Tsg2dvxswRaduEyS/E/lTCf66i10zP2SpTEnK27P7GZ29SfMC5jsN9IfZ4/LGnkAGPHTBIpHAengFFOzqLaJLrUjV1+/wVstDMpvjp/pMiNh9h1wUP8Ns44FKOwIMqxcirOpTpJ9dDJpwyfmT31TYAGUmCIQlz+FQoChR6eLB/wlT986qORMmY3zJJwSClRCjS58EQP18afIY9kfbC6yzCoOHcmFrAVIRfI4hcTuKHQ+ubTiqfSins+47dsQwXpW7jU98jEqKnWGhBE1xqUJ340KG3QXy; 4:JAHlHR/Dcbev1Nzf/uQs7atGLLCcB6D5VgGNwOkzs+NCIKsd1RIKkuEsxOK/53ctwG6l7uobz1KZwApfj+Bun92T1J79VKTnB5TzEwvK+VHVat6KcTdZheryAf+rT/rP+Ig3E4ZqChFaqQShntaqs4zE52iRYkUft8OnRIIbWu4SEFKSRM7H58uSRnHG92KdKHbRk2TP75/T049vCBRXOLsIGh7b4DCk1GvbY+1qF3sFrIMImuFXOgnex3kRwiXlk7Zp2ay6v/rsderDKszVvQ== X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(9101524173)(2401047)(8121501046)(823300264)(823320095)(10201501046)(3002001)(93006095)(93001095)(3231254)(944501410)(52105095)(201708071742011)(7699016); SRVR:DB7PR08MB3115; BCL:0; PCL:0; RULEID:; SRVR:DB7PR08MB3115; X-Forefront-Antispam-Report: SFV:SKI; SFS:; DIR:INB; SFP:; SCL:-1; SRVR:DB7PR08MB3115; H:finist_ce7.work; FPR:; SPF:None; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; DB7PR08MB3115; 23:PlrulR/uny7/DvTxvoWf5ZKuErU6p3OerOsQlIiKqCZ5yd2QcLpX1cyJYnfzAyXWr5SiiiQIPvHSe+mCCUYoWCoZJaL6qQTa5/p1/Ucrq4IASwqYcqcik6Oozx2IFQ4xcu5ozlIQr9tiOq/Q6zGmMA==; 6:9wgrdTg2gn4t9GXBRplB+fUSy3M2IlKmgSTCck4P7yVtL+7kl2Z3kJwWnTYJxVX8txR7HEJSlYQxfC898SN8+eeG9FGjO5lWId90vZJFqLmLkbLPuxXiSmfrd+iec/2HDrAXUeVZhlHGndOVZyd0NTmEroaxb7ZmL9MY2w2HrlrSBTOX+UL+YM7oPbHawldyZ43qGJ0uwLhEWnVT7/hY9DwX5ZS98Q2NzN2PZT5BUViXRwGf5oLO17pdznwWce2cpzTqNfhP3i3x3JgbBVFc5bkycoEUqI3X0aADa6OZZKgac9RYyr7zshHywzHtvvJz2Yf46kyENxVR/sCzM9aT3/6JHLKWBEu4qh+BEuCSBQloE3ZCkN5ce5/E/9WEaVZfr1oXElFIgrvRPwS+OFAddqi4BQJ0z5qQ5GdYyNbCKHyWXNUwConCtQLtqKt3saq8diNvEWxqxgD1ccndC3QQzw==; 5:DvjaDO9inpFbuhp3jLII5f0KYAcadwPNtAajCNyu3NC3YkBTv0liD468bW5HYv9vuqj2oSDU+wFO7WUJK4Z6O8s/hhoMYuz1EQ/IjvQD+EGepZrKE535PLDP74rqDAKN0Rw/C4OIknt+jVWSQmRXF7pi/Ge8g+bKOMKho+vwcEg=; 24:ygDH9WcLQrCbMnD/CkVnXX/IPKCZPdZNYZvOFBgcU2xyPWW/TX6QTgi2nDJIXy1HcLp7oCthXotgMD3j1XgOtnHCqCK2tAybQMfo7oS5ogU= X-Microsoft-Antispam-Message-Info: jB8k+PliGWRgRpHV6C+GgD83Tz7asaKmLXiXqj3RrZtp3rXwpHH/4a8zL7FYRmkFQAlGt+/gBoucKsPUNgDGFGlCAjb3jVBHh84k/evpvKJ5DNJxherowsE19K11jalS54bxezgFzsHNzUuTEQCNFpA8X4B+X2ROapiLDGB5nU5oQITQuD7B4haCskClkxLyTL5h5o8H2yewleMXrQVqwfQ8Qa7M099P76TDeqzmdTvzo5peE1PMy0AIT3TRWhqVaoyiYBiMIjaLLpDhgjKHH2VE8jPV2KTNBB1eXlTMOC4GS176NQBQEMeg2w4UM3y0E9wHvWrU8/TsE4fAl8kpjQ== SpamDiagnosticOutput: 1:0 X-Microsoft-Exchange-Diagnostics: 1; DB7PR08MB3115; 7:IJJUV5IjzP/+VrbgWwLHDyZ+AjI7FNNj3q7dTZCChXvuQcxX22M7c4Q/Pce2rPXiajEuBpT5v10JGBT5mYlzzZYapVFyNsJOIr0J7EGS8SlXn6EK+4LOCeJlEtEPM8gg2gFCy9rE6PlM/MfYcbTie0wqDtMoFenwJBD/Btw9746ydF9WBPDfLBsa3+tuV+e0oUyVraYXm/kZ6ZwV9YNcQfkOTCuX7MhSqkuBK9U/3aN/Xf/xY8BqLarKLdVKedEx; 20:ZQxdD+RTRBV535wlwV2N/nOJeEB154UZiLK1GSFqzwLsdKvfNe5Zu9y9MoSvAC1kmKMetJh2TOzyn6kXZ6DbAJB8ts5LD+gvvZs7Ka/8BkCDTyFmXAjBkNczrpVmo5LxOps/G90g3YEKG3mxc7eNYb3ZU/P0I1Gk3PMNu4VpAcw= X-OriginatorOrg: virtuozzo.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Jun 2018 10:06:59.5535 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4cfdf54d-eb3d-4961-4753-08d5d5033b1f X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 0bc7f26d-0264-416e-a6fc-8352af79c58f X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB7PR08MB3115 X-MS-Exchange-CrossPremises-OriginalClientIPAddress: 195.214.232.6 X-MS-Exchange-CrossPremises-AuthSource: DB7PR08MB3115.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: DB7PR08MB3115.eurprd08.prod.outlook.com Cc: OpenVZ devel <devel@openvz.org> Subject: [Devel] [PATCH RHEL7 COMMIT] ve/sysfs: handle NULL sysfs_dirent in sysfs_next_entry() 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/fs/sysfs/dir.c b/fs/sysfs/dir.c index f9294c00b571..485d77b0d419 100644 --- a/fs/sysfs/dir.c +++ b/fs/sysfs/dir.c @@ -1005,7 +1005,7 @@ static struct sysfs_dirent *sysfs_dir_pos(struct sysfs_dirent *parent_sd, static struct sysfs_dirent *sysfs_next_entry(struct sysfs_dirent *cur) { - struct rb_node *node = rb_next(&cur->s_rb); + struct rb_node *node = cur ? rb_next(&cur->s_rb) : NULL; return node ? to_sysfs_dirent(node) : NULL; }
The commit is pushed to "branch-rh7-3.10.0-693.21.1.vz7.50.x-ovz" and will appear at https://src.openvz.org/scm/ovz/vzkernel.git after rh7-3.10.0-693.21.1.vz7.50.11 ------> commit ca5aea989561f7ef4a2b2054f8d3c9cabe57023e Author: Vasily Averin <vvs@virtuozzo.com> Date: Mon Jun 18 13:06:55 2018 +0300 ve/sysfs: handle NULL sysfs_dirent in sysfs_next_entry() This patch fixes vz7 commit f9aed8d8fb35 ("VE/SYSFS: hide forbidden entries in container"). It spitted sysfs_dir_next_pos() into few parts including creation of sysfs_next_entry(). Originally this part of code worked correctly if sysfs_dir_pos had return NULL, however according check was lost during modification. This patch restores lost check, now sysfs_next_entry() will not crash if cur=NULL Fixes: f9aed8d8fb35 ("VE/SYSFS: hide forbidden entries in container") https://pmc.acronis.com/browse/VSTOR-11122 Signed-off-by: Vasily Averin <vvs@virtuozzo.com> --- fs/sysfs/dir.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)