Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.34 as permitted sender) client-ip=23.128.96.34;
From:   Kamalesh Babulal <kamalesh.babulal@oracle.com>
To:     Tejun Heo <tj@kernel.org>, Zefan Li <lizefan.x@bytedance.com>,
        Johannes Weiner <hannes@cmpxchg.org>
Cc:     Tom Hromatka <tom.hromatka@oracle.com>, cgroups@vger.kernel.org,
        linux-kernel@vger.kernel.org
Subject: [PATCH 1/2] cgroup: Check for ret during cgroup1_base_files cft addition
Date:   Tue, 12 Sep 2023 12:34:34 +0530
Message-ID: <96694dfc5f4caf4d84a740c3b18b0a456c9ff522.1694501024.git.kamalesh.babulal@oracle.com>
Content-Transfer-Encoding: 8bit
Content-Type: text/plain
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?DenBZuBWRv130BUwQk8Cw0zLI87w3mh/n9zsdpKsjbhNL0lDMfzYrGo5zsBs?=
 =?us-ascii?Q?p9gp88aMODMnZhrXdC0VqNsefB0blXKWbCSLwnDUfFcHshxgDrdclKfhtQSo?=
 =?us-ascii?Q?4er4lnXpNYl5aWP2E7rSON0nv4JtpzGX9GNr0mKLiCrtFl3nYjn2ZInab0p4?=
 =?us-ascii?Q?ZLvbqKjgi6t9TCXeAAIFAFH8DsTKdH8qxNrJFWDUFond5QRd86lv30f7I80N?=
 =?us-ascii?Q?qzW3fW+chnQDtgZAH8+vqmNfT0+Un1eRoDJ9sjk3RJ+Ga/agvv+4pVkS5ewr?=
 =?us-ascii?Q?jOaizaAM8KlhJc562t0qsTAdl3jsUU+heJ8C/3BwhH8/rFO9jhy9YbZzJ3xM?=
 =?us-ascii?Q?OQ4BoYuEGdXHRr6rN6IYZbyiqxGZslgYdIzHPFyC5x664D2iDyWXLTW8btFu?=
 =?us-ascii?Q?b4Wofwikw5578ZNnQERewFnG2IO4nBlmcdq6NlNbTd4sOv5HsXJXO8TW6z1H?=
 =?us-ascii?Q?ekRnTSd3Sz80j6jxSxTUCdf3kRjw6+FHlsF+Ob904fJHplFJir/pnCW11+Bv?=
 =?us-ascii?Q?KyB3g5kFuDqL5fK4/3E3fV+XzwJp5HqE+myYdx5q2EAa4JtTDrvXBrzIj5iC?=
 =?us-ascii?Q?rLwBjWfMP7IiJX7gnNzohG2d3BCdU2Zy8zS9eQXyYh8pFfrq2D6UERsWiH7l?=
 =?us-ascii?Q?58KdLrl1qZ7JYmcaLmWdUFcujBjFPYsiRGPr9fAOg6rcTBTsyI7sVJ/ep3vH?=
 =?us-ascii?Q?PdJrPwP4eIUSV9TP2m8haYC1IVIgsaC8qhl6TPcNG3gaE7aNaxo0Sz3FntiP?=
 =?us-ascii?Q?SpLF+TtyVDwZrayqCnEvp2KUC+a/DZx9mNnPse6k78KnvdITiSwi/96kjpTH?=
 =?us-ascii?Q?HwTLDgsa0MFRcyuR1EXpr3F4OtoD3Rk2W4ZP6n6AIiqbNT4IkZ1pk/hoyz3b?=
 =?us-ascii?Q?kVkLHF41ETnLGGINnlktgSKhr1599toi2agz5WJQPAWIgtmBJoN3a9KhK6tq?=
 =?us-ascii?Q?z/QRNxKAIflF9kqIioEr01lt5KL+spYZPUftb3Z6uVuQezbP5y4KU+FFJtV/?=
 =?us-ascii?Q?wAS+DzptUaV4E2vms06Xf+Mlq3CAJP5wAzq0kGlnBo9iqjsS7WG/x/H00Vh6?=
 =?us-ascii?Q?tDOS3BZfAvJz6JTFFE586u4JBZ+Cx/tf9J/srEJ+USr3XptkNpRR9XiksFRr?=
 =?us-ascii?Q?osnX8LempObHyHcnsNswfRl3pMlaHch190KY0A2plVJvGJnbPfCPN/NGsC8T?=
 =?us-ascii?Q?UUGfmfZqER/DQCBw3Z4SRqSAoOVjwt27pRmvQmzVp2ppHjSkfBOAJe9zn1Nj?=
 =?us-ascii?Q?QkdaKFPwk0iC/G98lBPJHsu94z4eM+5B4v1CxrIIBbccdxT5HZSAzyizjNz7?=
 =?us-ascii?Q?GmDOvb4s9/DwXNv0IqdHKKdvzs1Uz8Q2TGGmAAhdLHf7zUQ6kHEqCABbJI82?=
 =?us-ascii?Q?vwDzyIRWAu0Ga9x8VHfmd+HdWmD6a1oUWHuUsCexe1RObiCl3eHvib2vXPYZ?=
 =?us-ascii?Q?n1SNBLaXSrFdvgKCjbE0xlthqatFnEOfLrZUZrBoPuof5NRi6AZ44hWPyA+Z?=
 =?us-ascii?Q?+hRJAn9suYdQCj8voZT4ARcJtsIUjJJUwUB3B/vi8l/qnWRa7dzwrtVoACOR?=
 =?us-ascii?Q?79k9KRLG6MPvcFCzZmQrC8gTrCR97iszVmWI36PlEKPLnF2JNRknML+F4HUJ?=
 =?us-ascii?Q?tVxHN41Xw1/fEWEUOJRpkx6+yUwPEtk4ZaWGdZMmDpghe3hFeKGhtAl1g7JV?=
 =?us-ascii?Q?3Wy0/A=3D=3D?=
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-ExternalHop-MessageData-0: THndrcsiYDv2Cy3gL0ll3pZrbA+Qd3469cX711rf1oocPtvrYFoJiPkUGVu+vbtgpRbgDL+qikyx9B4NjP10yAQ0Cd0M553EFmhOtsPgUiFqc2gW6EsbhWrM/DtUfF5Ew+/j5DcuEE/H9GhhU9Fy1GV+vmWsl8hrqG0C8H08xJzaoQo4ySsLp9u6ZexWrXt2dnm+mffZsrzcdeEFAJTnDi29q2kVi+rLz1D7fhJVv95SOGX6nxvjXh5QxEbX3lHARLfmHQ0e7BePK5h+9otoU5NoFHLhXO+nVsACgcM+lHS2bRU/pZzjXS6FICPBc8W8drpW00ztzjMYkbknS3vteq/hNmVltn9thwZ05Q15coNPrcjBhgxyIBsPfVMJs0vJZJDjRkdoBlMVEIoHyo+Y0rtKjEt4lr/r+ky7P6nKLoWPcBeypJFpFVY69HS0WLn4VnTGLEeMfPWB+Lhf8/Ntu0fjHb82wPXKqTJGeodc7hoZ5swFobgReE//i6BArrwFlN4RKCXNKljIwgb6W+0U0PRzqAvar374m86+45dk7wpYF+B4ir8hRyUvETXOEp+NHRDnurex++JxDHmIjta8KEOZRrwxJ6MUMt+Xk2k/aigEJY+sslHDTn/OTYxxKI7R0dZJLOqX5UIVwhevJU6G4OeWfSJxTycCXojI+XUA5onPDnmCSPmueASAOP7UxRmUS99Ttf7SFyp06ok3Nl52mFJbP27Me9WTiAjtu+dSqVRQzd3bSmwfpMqKfvq8Wfoohl0Gp4JJDc2ZjLfCKHQ4F60SWb0WsSKvH36t1tCf4cuE3LKSoG0FR1TNEQgogqqB6hU/3PRyT+YQt6QfEKEZtNqIkyFO8CI0aE6/3I/ck8s=
X-OriginatorOrg: oracle.com
X-MS-Exchange-CrossTenant-Network-Message-Id: c3d55c30-b5a8-40c5-a105-08dbb35e9369
X-MS-Exchange-CrossTenant-AuthSource: DM6PR10MB3001.namprd10.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 12 Sep 2023 07:04:58.5700
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 4e2c6054-71cb-48f1-bd6c-3a9705aca71b
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: qxz9r9gpWODmWZJc9dp1kmscUpoWOUrKomyixnveWy+28GAIGIPsyLIFhbnFTyO2pu2GkUXzuYmQoan0tfoYO1vCG9ICpGtFsHbEGIBC56g=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH3PR10MB6689
X-Proofpoint-Virus-Version: vendor=baseguard
 engine=ICAP:2.0.267,Aquarius:18.0.957,Hydra:6.0.601,FMLib:17.11.176.26
 definitions=2023-09-12_04,2023-09-05_01,2023-05-22_02
X-Proofpoint-Spam-Details: rule=notspam policy=default score=0 malwarescore=0 suspectscore=0
 spamscore=0 mlxscore=0 mlxlogscore=999 adultscore=0 phishscore=0
 bulkscore=0 classifier=spam adjust=0 reason=mlx scancount=1
 engine=8.12.0-2308100000 definitions=main-2309120059
X-Proofpoint-GUID: _VMCm9yoGPwK1U7qHjUlNY_YXHCnORka
X-Proofpoint-ORIG-GUID: _VMCm9yoGPwK1U7qHjUlNY_YXHCnORka
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
X-Greylist: Sender passed SPF test, not delayed by milter-greylist-4.6.4 (howler.vger.email [0.0.0.0]); Tue, 12 Sep 2023 00:05:34 -0700 (PDT)

There is no check for possible failure while populating
cgroup1_base_files cft in css_populate_dir(), like its cgroup v2 counter
parts cgroup_{base,psi}_files.  In case of failure, the cgroup might not
be set up right.  Add ret value check to return on failure.

Signed-off-by: Kamalesh Babulal <kamalesh.babulal@oracle.com>
---
 kernel/cgroup/cgroup.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/kernel/cgroup/cgroup.c b/kernel/cgroup/cgroup.c
index 1fb7f562289d..a6b1ea324b0e 100644
--- a/kernel/cgroup/cgroup.c
+++ b/kernel/cgroup/cgroup.c
@@ -1731,8 +1731,10 @@ static int css_populate_dir(struct cgroup_subsys_state *css)
 					return ret;
 			}
 		} else {
-			cgroup_addrm_files(css, cgrp,
-					   cgroup1_base_files, true);
+			ret  =  cgroup_addrm_files(css, cgrp,
+						   cgroup1_base_files, true);
+			if  (ret  < 0)
+				return ret;
 		}
 	} else {
 		list_for_each_entry(cfts, &css->ss->cfts, node) {

base-commit: 0bb80ecc33a8fb5a682236443c1e740d5c917d1d
-- 
2.41.0