From: Greg Kroah-Hartman Date: Tue, 18 Aug 2020 15:11:06 +0000 (+0200) Subject: fix up queue-4.4/cxl-fix-kobject-memleak.patch X-Git-Tag: v4.19.140~1 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=7df71f3fa01d876238189ddf08be9127d7761e47;p=thirdparty%2Fkernel%2Fstable-queue.git fix up queue-4.4/cxl-fix-kobject-memleak.patch --- diff --git a/queue-4.4/cxl-fix-kobject-memleak.patch b/queue-4.4/cxl-fix-kobject-memleak.patch index bc2f1a60b47..267c6d969f8 100644 --- a/queue-4.4/cxl-fix-kobject-memleak.patch +++ b/queue-4.4/cxl-fix-kobject-memleak.patch @@ -23,14 +23,12 @@ Link: https://lore.kernel.org/r/20200602120733.5943-1-wanghai38@huawei.com Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin --- - drivers/misc/cxl/sysfs.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) + drivers/misc/cxl/sysfs.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) -diff --git a/drivers/misc/cxl/sysfs.c b/drivers/misc/cxl/sysfs.c -index 02006f7109a80..349955982081b 100644 --- a/drivers/misc/cxl/sysfs.c +++ b/drivers/misc/cxl/sysfs.c -@@ -539,7 +539,7 @@ static struct afu_config_record *cxl_sysfs_afu_new_cr(struct cxl_afu *afu, int c +@@ -539,7 +539,7 @@ static struct afu_config_record *cxl_sys rc = kobject_init_and_add(&cr->kobj, &afu_config_record_type, &afu->dev.kobj, "cr%i", cr->cr); if (rc) @@ -39,6 +37,13 @@ index 02006f7109a80..349955982081b 100644 rc = sysfs_create_bin_file(&cr->kobj, &cr->config_attr); if (rc) --- -2.25.1 - +@@ -555,9 +555,6 @@ err2: + err1: + kobject_put(&cr->kobj); + return ERR_PTR(rc); +-err: +- kfree(cr); +- return ERR_PTR(rc); + } + + void cxl_sysfs_afu_remove(struct cxl_afu *afu)