Skip to contentSkip to conversation

xfs: use strscpy() to instead of strncpy()

PATCH In review [email protected] 3 participants 3 messages Jan 9, 2023 – Feb 11, 2023 XFS filesystem

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfs: use strscpy() to instead of strncpy()

From: Xu Panda <[email protected]>

The implementation of strscpy() is more robust and safer. That's now the recommended way to copy NUL-terminated strings.

---
 fs/xfs/xfs_xattr.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
fs/xfs/xfs_xattr.c +1 -3
index 10aa1fd39d2b..913c1794bc2f 100644
@@ -212,9 +212,7 @@ __xfs_xattr_put_listent(
 	offset = context->buffer + context->count;
 	memcpy(offset, prefix, prefix_len);
 	offset += prefix_len;
-	strncpy(offset, (char *)name, namelen);			/* real name */
-	offset += namelen;
-	*offset = '\0';
+	strscpy(offset, (char *)name, namelen + 1);			/* real name */
 
 compute_size:
 	context->count += prefix_len + namelen + 1;
Signature · 1 line
2.15.2
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · On Mon, Jan 09, 2023 at 07:40:43PM +0800, [email protected] wrote:

From: Xu Panda <[email protected]>

The implementation of strscpy() is more robust and safer. That's now the recommended way to copy NUL-terminated strings.

Looks fine,

--D

Quoted 21 lines
---
 fs/xfs/xfs_xattr.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
fs/xfs/xfs_xattr.c +1 -3
index 10aa1fd39d2b..913c1794bc2f 100644
@@ -212,9 +212,7 @@ __xfs_xattr_put_listent(
 	offset = context->buffer + context->count;
 	memcpy(offset, prefix, prefix_len);
 	offset += prefix_len;
-	strncpy(offset, (char *)name, namelen);			/* real name */
-	offset += namelen;
-	*offset = '\0';
+	strscpy(offset, (char *)name, namelen + 1);			/* real name */
 
 compute_size:
 	context->count += prefix_len + namelen + 1;
Signature · 1 line
2.15.2
#2 lore raw
Quoted 18 lines · Darrick J. Wong
Quoted 7 lines · On Mon, Jan 09, 2023 at 07:40:43PM +0800, [email protected] wrote:

From: Xu Panda <[email protected]>

The implementation of strscpy() is more robust and safer. That's now the recommended way to copy NUL-terminated strings.

Looks fine,

--D

Quoted 4 lines
---
 fs/xfs/xfs_xattr.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)
Quoted 12 lines

fs/xfs/xfs_xattr.c __xfs_xattr_put_listent( · line 215

Quoted 12 lines
fs/xfs/xfs_xattr.c +1 -3
index 10aa1fd39d2b..913c1794bc2f 100644
@@ -212,9 +212,7 @@ __xfs_xattr_put_listent(
 	offset = context->buffer + context->count;
 	memcpy(offset, prefix, prefix_len);
 	offset += prefix_len;
-	strncpy(offset, (char *)name, namelen);			/* real name */
-	offset += namelen;
-	*offset = '\0';
+	strscpy(offset, (char *)name, namelen + 1);			/* real name */

The name is not null terminated, it will result slab-out-of-bounds in strscpy().

[1] https://lore.kernel.org/linux-xfs/[email protected]/T/#u

Quoted 5 lines
Quoted 5 lines
fs/xfs/xfs_xattr.c +0 -0
 compute_size:
 	context->count += prefix_len + namelen + 1;
Signature · 1 line
2.15.2