s390/zcrtpt: Don't leak memory if dev_set_name() fails
Subsystems (2)
PATCH 1/2 s390/zcrtpt: Don't leak memory if dev_set_name() fails
When dev_set_name() fails, the zcdn_create() doesn't free the newly allocated resources. Do it.
--- drivers/s390/crypto/zcrypt_api.c | 1 + 1 file changed, 1 insertion(+)
drivers/s390/crypto/zcrypt_api.c +1 -0
@@ -413,6 +413,7 @@ static int zcdn_create(const char *name) ZCRYPT_NAME "_%d", (int)MINOR(devt)); nodename[sizeof (nodename) -1 ] ='\0' ;if (dev_set_name (&zcdndev->device, nodename)) { +kfree (zcdndev); rc = -EINVAL ; goto unlockout; }
Signature · 1 line
2.40.0.1.gaa8946217a0b
PATCH 2/2 s390/zcrypt: Utilize dev_set_name() ability to use a formatted string
With the dev_set_name() prototype it's not obvious that it takes a formatted string as a parameter. Use its facility instead of duplicating the same with strncpy()/snprintf() calls.
With this, also prevent return error code to be shadowed.
--- drivers/s390/crypto/zcrypt_api.c | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-)
drivers/s390/crypto/zcrypt_api.c +3 -7
@@ -366,7 +366,6 @@ static int zcdn_create(const char *name) {dev_t devt;int i, rc =0 ; -char nodename[ZCDN_MAX_NAME ];struct zcdn_device *zcdndev;if (mutex_lock_interruptible (&ap_perms_mutex))
@@ -407,14 +406,11 @@ static int zcdn_create(const char *name) zcdndev->device.devt = devt; zcdndev->device.groups = zcdn_dev_attr_groups;if (name[0 ]) -strncpy (nodename, name,sizeof (nodename)); + rc =dev_set_name (&zcdndev->device,"%s" , name);else -snprintf (nodename,sizeof (nodename), -ZCRYPT_NAME "_%d" , (int )MINOR (devt)); - nodename[sizeof (nodename) -1 ] ='\0' ; -if (dev_set_name (&zcdndev->device, nodename)) { + rc =dev_set_name (&zcdndev->device,ZCRYPT_NAME "_%d" , (int )MINOR (devt)); +if (rc) {kfree (zcdndev); - rc = -EINVAL ; goto unlockout; } rc =device_register (&zcdndev->device);
Signature · 1 line
2.40.0.1.gaa8946217a0b
Harald Freudenberger
maintainerQuoted 14 lines · Andy Shevchenko
When
dev_set_name()fails, thezcdn_create()doesn't free the newly allocated resources. Do it.Fixes 00fab2350e6b ("s390/zcrypt: multiple zcrypt device nodes support")Signed-off-by Andy Shevchenko <[email protected]>--- drivers/s390/crypto/zcrypt_api.c | 1 + 1 file changed, 1 insertion(+)drivers/s390/crypto/zcrypt_api.c +0
-0
drivers/s390/crypto/zcrypt_api.c static int zcdn_create(const char *name) · line 419
Quoted 7 lines
drivers/s390/crypto/zcrypt_api.c +1
-0@@ -413,6 +413,7 @@ static int zcdn_create(const char *name) ZCRYPT_NAME "_%d", (int)MINOR(devt)); nodename[sizeof (nodename) -1 ] ='\0' ;if (dev_set_name (&zcdndev->device, nodename)) { +kfree (zcdndev); rc = -EINVAL ; goto unlockout; }
Thanks Andy, I picked this patch and forwarded it into the s390 subsystem. This will be visible in Linus' kernel tree with the next merge.