drivers/block/rbd: Use strscpy() to copy strings into arrays
Subsystems (2)
PATCH 1/1 drivers/block/rbd: Use strscpy() to copy strings into arrays
From: David Laight <[email protected]>
Replacing strcpy() with strscpy() ensures than overflow of the target buffer cannot happen.
---
This is one of a group of patches that remove potentially unbounded strcpy() calls.
They are mostly replaced by strscpy() or, when strlen() has just been called, with memcpy() (usually including the '\0').
Calls with copy string literals into arrays are left unchanged. They are safe and easily detected as such.
The changes were made by getting the compiler to detect the calls and then fixing the code by hand.
Note that all the changes are only compile tested.
Some Makefiles were changed to allow files to contain strcpy(). As well as 'difficult to fix' files, this included 'show' functions as they really need to use sysfs_emit() or seq_printf().
All the patches are being sent individually to avoid very long cc lists. Apologies for the terse commit messages and likely unexpected tags. (There are about 100 patches in total.)
drivers/block/rbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/block/rbd.c +1 -1
@@ -3672,7 +3672,7 @@ static void __rbd_lock(struct rbd_device *rbd_dev, const char *cookie)struct rbd_client_id cid =rbd_get_cid (rbd_dev); rbd_dev->lock_state =RBD_LOCK_STATE_LOCKED ; -strcpy (rbd_dev->lock_cookie, cookie); +strscpy (rbd_dev->lock_cookie, cookie);rbd_set_owner_cid (rbd_dev, &cid);queue_work (rbd_dev->task_wq, &rbd_dev->acquired_lock_work); }
Signature · 1 line
2.39.5
Quoted 37 lines · On 6/6/26 3:27 PM, [email protected] wrote:
From: David Laight <[email protected]>
Replacing
strcpy()withstrscpy()ensures than overflow of the target buffer cannot happen.Signed-off-by David Laight <[email protected]>---
This is one of a group of patches that remove potentially unboundedstrcpy()calls.They are mostly replaced by
strscpy()or, whenstrlen()has just been called, withmemcpy()(usually including the '\0').Calls with copy string literals into arrays are left unchanged. They are safe and easily detected as such.
The changes were made by getting the compiler to detect the calls and then fixing the code by hand.
Note that all the changes are only compile tested.
Some Makefiles were changed to allow files to contain
strcpy(). As well as 'difficult to fix' files, this included 'show' functions as they really need to usesysfs_emit()orseq_printf().All the patches are being sent individually to avoid very long cc lists. Apologies for the terse commit messages and likely unexpected tags. (There are about 100 patches in total.)
drivers/block/rbd.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)drivers/block/rbd.c +0
-0
drivers/block/rbd.c static void __rbd_lock(struct rbd_device *rbd_dev, const char *cookie) · line 3675
Quoted 5 lines
drivers/block/rbd.c +1
-1@@ -3672,7 +3672,7 @@ static void __rbd_lock(struct rbd_device *rbd_dev, const char *cookie)struct rbd_client_id cid =rbd_get_cid (rbd_dev); rbd_dev->lock_state =RBD_LOCK_STATE_LOCKED ; -strcpy (rbd_dev->lock_cookie, cookie); +strscpy (rbd_dev->lock_cookie, cookie);
This looks good. The rbd_device->lock_cookie is a 32 byte array.
Cookies passed in are always a 32 byte array (despite the function only requiring a string pointer).
Quoted 3 lines
drivers/block/rbd.c +0
-0rbd_set_owner_cid (rbd_dev, &cid);queue_work (rbd_dev->task_wq, &rbd_dev->acquired_lock_work); }
Quoted 2 lines · On Sat, 06 Jun 2026 21:27:44 +0100, [email protected] wrote:
Replacing
strcpy()withstrscpy()ensures than overflow of the target buffer cannot happen.
Applied, thanks!
[1/1] drivers/block/rbd: Use strscpy() to copy strings into arrays
commit: 5ef1b0194b382fafe5023b5b014e4db3b948ee15
Best regards,
Signature · 1 line
Jens Axboe