From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Andreas Gruenbacher <agruenba@redhat.com>,
Wolfram Sang <wsa+renesas@sang-engineering.com>,
Sasha Levin <sashal@kernel.org>,
rpeterso@redhat.com, cluster-devel@redhat.com
Subject: [PATCH AUTOSEL 5.15 03/21] gfs2: Switch from strlcpy to strscpy
Date: Mon, 17 Oct 2022 20:09:22 -0400 [thread overview]
Message-ID: <20221018000940.2731329-3-sashal@kernel.org> (raw)
In-Reply-To: <20221018000940.2731329-1-sashal@kernel.org>
From: Andreas Gruenbacher <agruenba@redhat.com>
[ Upstream commit 204c0300c4e99707e9fb6e57840aa1127060e63f ]
Switch from strlcpy to strscpy and make sure that @count is the size of
the smaller of the source and destination buffers. This prevents
reading beyond the end of the source buffer when the source string isn't
null terminated.
Found by a modified version of syzkaller.
Suggested-by: Wolfram Sang <wsa+renesas@sang-engineering.com>
Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
fs/gfs2/ops_fstype.c | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/fs/gfs2/ops_fstype.c b/fs/gfs2/ops_fstype.c
index 7f8410d8fdc1..f461a365eb38 100644
--- a/fs/gfs2/ops_fstype.c
+++ b/fs/gfs2/ops_fstype.c
@@ -385,8 +385,10 @@ static int init_names(struct gfs2_sbd *sdp, int silent)
if (!table[0])
table = sdp->sd_vfs->s_id;
- strlcpy(sdp->sd_proto_name, proto, GFS2_FSNAME_LEN);
- strlcpy(sdp->sd_table_name, table, GFS2_FSNAME_LEN);
+ BUILD_BUG_ON(GFS2_LOCKNAME_LEN > GFS2_FSNAME_LEN);
+
+ strscpy(sdp->sd_proto_name, proto, GFS2_LOCKNAME_LEN);
+ strscpy(sdp->sd_table_name, table, GFS2_LOCKNAME_LEN);
table = sdp->sd_table_name;
while ((table = strchr(table, '/')))
@@ -1443,13 +1445,13 @@ static int gfs2_parse_param(struct fs_context *fc, struct fs_parameter *param)
switch (o) {
case Opt_lockproto:
- strlcpy(args->ar_lockproto, param->string, GFS2_LOCKNAME_LEN);
+ strscpy(args->ar_lockproto, param->string, GFS2_LOCKNAME_LEN);
break;
case Opt_locktable:
- strlcpy(args->ar_locktable, param->string, GFS2_LOCKNAME_LEN);
+ strscpy(args->ar_locktable, param->string, GFS2_LOCKNAME_LEN);
break;
case Opt_hostdata:
- strlcpy(args->ar_hostdata, param->string, GFS2_LOCKNAME_LEN);
+ strscpy(args->ar_hostdata, param->string, GFS2_LOCKNAME_LEN);
break;
case Opt_spectator:
args->ar_spectator = 1;
--
2.35.1
next prev parent reply other threads:[~2022-10-18 0:20 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-10-18 0:09 [PATCH AUTOSEL 5.15 01/21] crypto: qcom-rng - Fix qcom_rng_of_match unused warning Sasha Levin
2022-10-18 0:09 ` [PATCH AUTOSEL 5.15 02/21] crypto: ccp - Add a quirk to firmware update Sasha Levin
2022-10-18 0:09 ` Sasha Levin [this message]
2022-10-18 0:09 ` [PATCH AUTOSEL 5.15 04/21] powerpc/hw_breakpoint: Avoid relying on caller synchronization Sasha Levin
2022-10-18 0:09 ` [PATCH AUTOSEL 5.15 05/21] cgroup: Remove data-race around cgrp_dfl_visible Sasha Levin
2022-10-18 0:09 ` [PATCH AUTOSEL 5.15 06/21] of/fdt: Don't calculate initrd size from DT if start > end Sasha Levin
2022-10-18 0:09 ` [PATCH AUTOSEL 5.15 07/21] objtool,x86: Teach decode about LOOP* instructions Sasha Levin
2022-10-18 0:09 ` [PATCH AUTOSEL 5.15 08/21] locking/rwsem: Disable preemption while trying for rwsem lock Sasha Levin
2022-10-18 0:09 ` [PATCH AUTOSEL 5.15 09/21] gfs2: Check sb_bsize_shift after reading superblock Sasha Levin
2022-10-18 0:09 ` [PATCH AUTOSEL 5.15 10/21] powerpc/64: don't refer nr_cpu_ids in asm code when it's undefined Sasha Levin
2022-10-18 0:09 ` [PATCH AUTOSEL 5.15 11/21] m68knommu: fix non-specific 68328 choice interrupt build failure Sasha Levin
2022-10-18 0:09 ` [PATCH AUTOSEL 5.15 12/21] m68knommu: fix non-mmu classic 68000 legacy timer tick selection Sasha Levin
2022-10-18 0:09 ` [PATCH AUTOSEL 5.15 13/21] of: Fix "dma-ranges" handling for bus controllers Sasha Levin
2022-10-18 0:09 ` [PATCH AUTOSEL 5.15 14/21] x86/hyperv: Replace kmap() with kmap_local_page() Sasha Levin
2022-10-18 0:09 ` [PATCH AUTOSEL 5.15 15/21] kmsan: disable instrumentation of unsupported common kernel code Sasha Levin
2022-10-18 0:09 ` [PATCH AUTOSEL 5.15 16/21] kmsan: disable physical page merging in biovec Sasha Levin
2022-10-18 0:09 ` [PATCH AUTOSEL 5.15 17/21] f2fs: fix to detect corrupted meta ino Sasha Levin
2022-10-18 0:09 ` [PATCH AUTOSEL 5.15 18/21] 9p: trans_fd/p9_conn_cancel: drop client lock earlier Sasha Levin
2022-10-18 0:09 ` [PATCH AUTOSEL 5.15 19/21] 9p/trans_fd: always use O_NONBLOCK read/write Sasha Levin
2022-10-18 0:09 ` [PATCH AUTOSEL 5.15 20/21] net/9p: use a dedicated spinlock for trans_fd Sasha Levin
2022-10-18 0:09 ` [PATCH AUTOSEL 5.15 21/21] virtio_pci: don't try to use intxif pin is zero Sasha Levin
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20221018000940.2731329-3-sashal@kernel.org \
--to=sashal@kernel.org \
--cc=agruenba@redhat.com \
--cc=cluster-devel@redhat.com \
--cc=linux-kernel@vger.kernel.org \
--cc=rpeterso@redhat.com \
--cc=stable@vger.kernel.org \
--cc=wsa+renesas@sang-engineering.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox