From: "Darrick J. Wong" <djwong@kernel.org>
To: sandeen@sandeen.net, darrick.wong@oracle.com
Cc: linux-xfs@vger.kernel.org
Subject: [PATCH 1/3] misc: fix valgrind complaints
Date: Fri, 08 Jan 2021 22:28:40 -0800 [thread overview]
Message-ID: <161017372088.1142776.17470250928392025583.stgit@magnolia> (raw)
In-Reply-To: <161017371478.1142776.6610535704942901172.stgit@magnolia>
From: Darrick J. Wong <djwong@kernel.org>
Zero the memory that we pass to the kernel via ioctls so that we never
pass userspace heap/stack garbage around. This silences valgrind
complaints about uninitialized padding areas.
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
libhandle/handle.c | 7 ++++++-
scrub/inodes.c | 1 +
scrub/spacemap.c | 2 +-
3 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/libhandle/handle.c b/libhandle/handle.c
index 5c1686b3..a6b35b09 100644
--- a/libhandle/handle.c
+++ b/libhandle/handle.c
@@ -235,9 +235,12 @@ obj_to_handle(
{
char hbuf [MAXHANSIZ];
int ret;
- uint32_t handlen;
+ uint32_t handlen = 0;
xfs_fsop_handlereq_t hreq;
+ memset(&hreq, 0, sizeof(hreq));
+ memset(hbuf, 0, MAXHANSIZ);
+
if (opcode == XFS_IOC_FD_TO_HANDLE) {
hreq.fd = obj.fd;
hreq.path = NULL;
@@ -280,6 +283,7 @@ open_by_fshandle(
if ((fsfd = handle_to_fsfd(fshanp, &path)) < 0)
return -1;
+ memset(&hreq, 0, sizeof(hreq));
hreq.fd = 0;
hreq.path = NULL;
hreq.oflags = rw | O_LARGEFILE;
@@ -387,6 +391,7 @@ attr_list_by_handle(
if ((fd = handle_to_fsfd(hanp, &path)) < 0)
return -1;
+ memset(&alhreq, 0, sizeof(alhreq));
alhreq.hreq.fd = 0;
alhreq.hreq.path = NULL;
alhreq.hreq.oflags = O_LARGEFILE;
diff --git a/scrub/inodes.c b/scrub/inodes.c
index 4550db83..f2bce16f 100644
--- a/scrub/inodes.c
+++ b/scrub/inodes.c
@@ -129,6 +129,7 @@ scan_ag_inodes(
minor(ctx->fsinfo.fs_datadev),
agno);
+ memset(&handle, 0, sizeof(handle));
memcpy(&handle.ha_fsid, ctx->fshandle, sizeof(handle.ha_fsid));
handle.ha_fid.fid_len = sizeof(xfs_fid_t) -
sizeof(handle.ha_fid.fid_len);
diff --git a/scrub/spacemap.c b/scrub/spacemap.c
index 9653916d..9362710e 100644
--- a/scrub/spacemap.c
+++ b/scrub/spacemap.c
@@ -47,7 +47,7 @@ scrub_iterate_fsmap(
int i;
int error;
- head = malloc(fsmap_sizeof(FSMAP_NR));
+ head = calloc(1, fsmap_sizeof(FSMAP_NR));
if (!head)
return errno;
next prev parent reply other threads:[~2021-01-09 6:29 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-09 6:28 [PATCHSET 0/3] various: random fixes Darrick J. Wong
2021-01-09 6:28 ` Darrick J. Wong [this message]
2021-01-11 13:38 ` [PATCH 1/3] misc: fix valgrind complaints Chandan Babu R
2021-01-12 1:22 ` Darrick J. Wong
2021-01-11 17:27 ` Christoph Hellwig
2021-01-12 1:22 ` Darrick J. Wong
2021-01-09 6:28 ` [PATCH 2/3] xfs_scrub: load and unload libicu properly Darrick J. Wong
2021-01-11 14:15 ` Chandan Babu R
2021-01-12 1:21 ` Darrick J. Wong
2021-01-09 6:28 ` [PATCH 3/3] xfs_scrub: handle concurrent directory updates during name scan Darrick J. Wong
2021-01-12 11:15 ` Chandan Babu R
2021-01-12 17:13 ` Darrick J. Wong
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=161017372088.1142776.17470250928392025583.stgit@magnolia \
--to=djwong@kernel.org \
--cc=darrick.wong@oracle.com \
--cc=linux-xfs@vger.kernel.org \
--cc=sandeen@sandeen.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.