Merge tag 'optee-fix-for-v6.8' of https://git.linaro.org/people/jens.wiklander/linux-tee into arm/fixes

arndb · arndb · commit 64b9175055a6 · 2024-03-04T15:26:16.000+01:00
Fix kernel panic in OP-TEE driver * tag 'optee-fix-for-v6.8' of https://git.linaro.org/people/jens.wiklander/linux-tee: tee: optee: Fix kernel panic caused by incorrect error handling Link: https://lore.kernel.org/r/20240304132727.GA3501807@rayden Signed-off-by: Arnd Bergmann <arnd@arndb.de>
diff --git a/drivers/tee/optee/device.c b/drivers/tee/optee/device.c
@@ -90,13 +90,14 @@ static int optee_register_device(const uuid_t *device_uuid, u32 func)
 	if (rc) {
 		pr_err("device registration failed, err: %d\n", rc);
 		put_device(&optee_device->dev);
+		return rc;
 	}
 
 	if (func == PTA_CMD_GET_DEVICES_SUPP)
 		device_create_file(&optee_device->dev,
 				   &dev_attr_need_supplicant);
 
-	return rc;
+	return 0;
 }
 
 static int __optee_enumerate_devices(u32 func)

Original file line number	Diff line number	Diff line change
`@@ -90,13 +90,14 @@ static int optee_register_device(const uuid_t *device_uuid, u32 func)`
`90`	`90`	`if (rc) {`
`91`	`91`	`pr_err("device registration failed, err: %d\n", rc);`
`92`	`92`	`put_device(&optee_device->dev);`
	`93`	`+ return rc;`
`93`	`94`	`}`
`94`	`95`
`95`	`96`	`if (func == PTA_CMD_GET_DEVICES_SUPP)`
`96`	`97`	`device_create_file(&optee_device->dev,`
`97`	`98`	`&dev_attr_need_supplicant);`
`98`	`99`
`99`		`- return rc;`
	`100`	`+ return 0;`
`100`	`101`	`}`
`101`	`102`
`102`	`103`	`static int __optee_enumerate_devices(u32 func)`