Commit 13db54aa authored by Thorsten Blum's avatar Thorsten Blum Committed by Andrew Morton
Browse files

ocfs2: replace deprecated strcpy with strscpy 

strcpy() has been deprecated [1] because it performs no bounds checking on
the destination buffer, which can lead to buffer overflows.  Replace it
with the safer strscpy(), and copy directly into '->rf_signature' instead
of using the start of the struct as the destination buffer.

Link: https://www.kernel.org/doc/html/latest/process/deprecated.html#strcpy [1]
Link: https://lkml.kernel.org/r/20251118185345.132411-3-thorsten.blum@linux.dev


Signed-off-by: default avatarThorsten Blum <thorsten.blum@linux.dev>
Reviewed-by: default avatarJoseph Qi <joseph.qi@linux.alibaba.com>
Cc: Joel Becker <jlbec@evilplan.org>
Cc: Mark Fasheh <mark@fasheh.com>
Cc: Junxiao Bi <junxiao.bi@oracle.com>
Cc: Changwei Ge <gechangwei@live.cn>
Cc: Jun Piao <piaojun@huawei.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 4022ba20

fs/ocfs2/refcounttree.c

+3 −2
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
#include <linux/pagevec.h>

#include <linux/swap.h>

#include <linux/security.h>

#include <linux/string.h>

#include <linux/fsnotify.h>

#include <linux/quotaops.h>

#include <linux/namei.h>
@@ -621,7 +622,7 @@ static int ocfs2_create_refcount_tree(struct inode *inode, 
	/* Initialize ocfs2_refcount_block. */

	rb = (struct ocfs2_refcount_block *)new_bh->b_data;

	memset(rb, 0, inode->i_sb->s_blocksize);

	strcpy((void *)rb, OCFS2_REFCOUNT_BLOCK_SIGNATURE);

	strscpy(rb->rf_signature, OCFS2_REFCOUNT_BLOCK_SIGNATURE);

	rb->rf_suballoc_slot = cpu_to_le16(meta_ac->ac_alloc_slot);

	rb->rf_suballoc_loc = cpu_to_le64(suballoc_loc);

	rb->rf_suballoc_bit = cpu_to_le16(suballoc_bit_start);
@@ -1562,7 +1563,7 @@ static int ocfs2_new_leaf_refcount_block(handle_t *handle, 
	/* Initialize ocfs2_refcount_block. */

	new_rb = (struct ocfs2_refcount_block *)new_bh->b_data;

	memset(new_rb, 0, sb->s_blocksize);

	strcpy((void *)new_rb, OCFS2_REFCOUNT_BLOCK_SIGNATURE);

	strscpy(new_rb->rf_signature, OCFS2_REFCOUNT_BLOCK_SIGNATURE);

	new_rb->rf_suballoc_slot = cpu_to_le16(meta_ac->ac_alloc_slot);

	new_rb->rf_suballoc_loc = cpu_to_le64(suballoc_loc);

	new_rb->rf_suballoc_bit = cpu_to_le16(suballoc_bit_start);