From: Lukas Czerner <lczerner@redhat.com>
To: linux-ext4@vger.kernel.org
Subject: [PATCH 2/4] e2fsck: use size_t instead of int in string_copy()
Date: Fri, 5 Jun 2020 10:14:40 +0200 [thread overview]
Message-ID: <20200605081442.13428-2-lczerner@redhat.com> (raw)
In-Reply-To: <20200605081442.13428-1-lczerner@redhat.com>
len argument in string_copy() is int, but it is used with malloc(),
strlen(), strncpy() and some callers use sizeof() to pass value in. So
it really ought to be size_t rather than int. Fix it.
Signed-off-by: Lukas Czerner <lczerner@redhat.com>
---
e2fsck/e2fsck.h | 2 +-
e2fsck/util.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/e2fsck/e2fsck.h b/e2fsck/e2fsck.h
index 9b2b9ce8..85f953b2 100644
--- a/e2fsck/e2fsck.h
+++ b/e2fsck/e2fsck.h
@@ -627,7 +627,7 @@ extern void log_err(e2fsck_t ctx, const char *fmt, ...)
extern void e2fsck_read_bitmaps(e2fsck_t ctx);
extern void e2fsck_write_bitmaps(e2fsck_t ctx);
extern void preenhalt(e2fsck_t ctx);
-extern char *string_copy(e2fsck_t ctx, const char *str, int len);
+extern char *string_copy(e2fsck_t ctx, const char *str, size_t len);
extern int fs_proc_check(const char *fs_name);
extern int check_for_modules(const char *fs_name);
#ifdef RESOURCE_TRACK
diff --git a/e2fsck/util.c b/e2fsck/util.c
index d98b8e47..88e0ea8a 100644
--- a/e2fsck/util.c
+++ b/e2fsck/util.c
@@ -135,7 +135,7 @@ void *e2fsck_allocate_memory(e2fsck_t ctx, unsigned long size,
}
char *string_copy(e2fsck_t ctx EXT2FS_ATTR((unused)),
- const char *str, int len)
+ const char *str, size_t len)
{
char *ret;
--
2.21.3
next prev parent reply other threads:[~2020-06-05 8:14 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-06-05 8:14 [PATCH 1/4] e2fsck: remove unused variable 'new_array' Lukas Czerner
2020-06-05 8:14 ` Lukas Czerner [this message]
2020-06-05 21:26 ` [PATCH 2/4] e2fsck: use size_t instead of int in string_copy() Andreas Dilger
2020-10-01 20:43 ` Theodore Y. Ts'o
2020-06-05 8:14 ` [PATCH 3/4] e2fsck: use the right conversion specifier in e2fsck_allocate_memory() Lukas Czerner
2020-06-05 20:42 ` Andreas Dilger
2020-10-01 20:49 ` Theodore Y. Ts'o
2020-06-05 8:14 ` [PATCH 4/4] ext2fs: remove unused variable 'left' Lukas Czerner
2020-06-05 20:48 ` Andreas Dilger
2020-10-01 20:51 ` Theodore Y. Ts'o
2020-06-05 20:36 ` [PATCH 1/4] e2fsck: remove unused variable 'new_array' Andreas Dilger
2020-06-05 20:38 ` Andreas Dilger
2020-09-22 12:37 ` Lukas Czerner
2020-10-01 20:43 ` Theodore Y. Ts'o
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=20200605081442.13428-2-lczerner@redhat.com \
--to=lczerner@redhat.com \
--cc=linux-ext4@vger.kernel.org \
/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.