!353 mkfs.bfs fix memory leaks
From: @hugel Reviewed-by: @jiayi0118 Signed-off-by: @jiayi0118
This commit is contained in:
openeuler-ci-bot
Gitee
commit
0fa59c63a4
112
backport-mkfs.bfs-fix-memory-leaks-and-weak-code.patch
Normal file
112
backport-mkfs.bfs-fix-memory-leaks-and-weak-code.patch
Normal file
@ -0,0 +1,112 @@
|
||||
From 2c6ce1240f118a2d00ad93060da409c3995b7f67 Mon Sep 17 00:00:00 2001
|
||||
From: Karel Zak <kzak@redhat.com>
|
||||
Date: Tue, 1 Apr 2025 15:54:07 +0200
|
||||
Subject: [PATCH] mkfs.bfs: fix memory leaks and weak code
|
||||
|
||||
- use size_t to store strlen() result
|
||||
- init superblock with the default volume and fsname
|
||||
- don't use strdup(), it's unnecessary as getopt_long() does not
|
||||
modify arguments
|
||||
- don't use memcpy() as we need to check string sizes
|
||||
- restrict verbose output 6 bytes
|
||||
|
||||
Addresses: https://github.com/util-linux/util-linux/pull/3488
|
||||
Signed-off-by: Karel Zak <kzak@redhat.com>
|
||||
|
||||
Reference:https://github.com/util-linux/util-linux/commit/2c6ce1240f118a2d00ad93060da409c3995b7f67
|
||||
Conflict:context adaptation
|
||||
|
||||
---
|
||||
disk-utils/mkfs.bfs.c | 34 ++++++++++++++++++++++------------
|
||||
1 file changed, 22 insertions(+), 12 deletions(-)
|
||||
|
||||
diff --git a/disk-utils/mkfs.bfs.c b/disk-utils/mkfs.bfs.c
|
||||
index 895a1f27b..d18589ab2 100644
|
||||
--- a/disk-utils/mkfs.bfs.c
|
||||
+++ b/disk-utils/mkfs.bfs.c
|
||||
@@ -103,7 +103,7 @@ static void __attribute__((__noreturn__)) usage(void)
|
||||
|
||||
int main(int argc, char **argv)
|
||||
{
|
||||
- char *device, *volume, *fsname;
|
||||
+ char *device, *volume = NULL, *fsname = NULL;
|
||||
long inodes;
|
||||
unsigned long long total_blocks, ino_bytes, ino_blocks, data_blocks;
|
||||
unsigned long long user_specified_total_blocks = 0;
|
||||
@@ -111,12 +111,16 @@ int main(int argc, char **argv)
|
||||
int verbose = 0;
|
||||
int fd;
|
||||
uint32_t first_block;
|
||||
- struct bfssb sb;
|
||||
struct bfsi ri;
|
||||
struct bfsde de;
|
||||
struct stat statbuf;
|
||||
time_t now;
|
||||
- int c, i, len;
|
||||
+ int c, i;
|
||||
+ size_t len;
|
||||
+ struct bfssb sb = {
|
||||
+ .s_fsname = "\x20\x20\x20\x20\x20\x20",
|
||||
+ .s_volume = "\x20\x20\x20\x20\x20\x20"
|
||||
+ };
|
||||
|
||||
enum { VERSION_OPTION = CHAR_MAX + 1 };
|
||||
static const struct option longopts[] = {
|
||||
@@ -145,7 +149,6 @@ int main(int argc, char **argv)
|
||||
if (argc == 2 && !strcmp(argv[1], "-V"))
|
||||
print_version(EXIT_SUCCESS);
|
||||
|
||||
- volume = fsname = " "; /* is there a default? */
|
||||
inodes = 0;
|
||||
|
||||
while ((c = getopt_long(argc, argv, "N:V:F:vhcl", longopts, NULL)) != -1) {
|
||||
@@ -155,17 +158,21 @@ int main(int argc, char **argv)
|
||||
break;
|
||||
|
||||
case 'V':
|
||||
+ if (volume)
|
||||
+ errx(EXIT_FAILURE, _("more than one volume"));
|
||||
len = strlen(optarg);
|
||||
- if (len <= 0 || len > 6)
|
||||
+ if (!len || len > sizeof(sb.s_volume))
|
||||
errx(EXIT_FAILURE, _("volume name too long"));
|
||||
- volume = xstrdup(optarg);
|
||||
+ volume = optarg;
|
||||
break;
|
||||
|
||||
case 'F':
|
||||
+ if (fsname)
|
||||
+ errx(EXIT_FAILURE, _("more than one fsname"));
|
||||
len = strlen(optarg);
|
||||
- if (len <= 0 || len > 6)
|
||||
+ if (!len || len > sizeof(sb.s_fsname))
|
||||
errx(EXIT_FAILURE, _("fsname name too long"));
|
||||
- fsname = xstrdup(optarg);
|
||||
+ fsname = optarg;
|
||||
break;
|
||||
|
||||
case 'v':
|
||||
@@ -260,13 +267,16 @@ int main(int argc, char **argv)
|
||||
sb.s_start = cpu_to_le32(ino_bytes + sizeof(struct bfssb));
|
||||
sb.s_end = cpu_to_le32(total_blocks * BFS_BLOCKSIZE - 1);
|
||||
sb.s_from = sb.s_to = sb.s_backup_from = sb.s_backup_to = -1;
|
||||
- memcpy(sb.s_fsname, fsname, 6);
|
||||
- memcpy(sb.s_volume, volume, 6);
|
||||
+
|
||||
+ if (fsname)
|
||||
+ str2memcpy(sb.s_fsname, fsname, sizeof(sb.s_fsname));
|
||||
+ if (volume)
|
||||
+ str2memcpy(sb.s_volume, volume, sizeof(sb.s_volume));
|
||||
|
||||
if (verbose) {
|
||||
fprintf(stderr, _("Device: %s\n"), device);
|
||||
- fprintf(stderr, _("Volume: <%-6s>\n"), volume);
|
||||
- fprintf(stderr, _("FSname: <%-6s>\n"), fsname);
|
||||
+ fprintf(stderr, _("Volume: <%.6s>\n"), sb.s_volume);
|
||||
+ fprintf(stderr, _("FSname: <%.6s>\n"), sb.s_fsname);
|
||||
fprintf(stderr, _("BlockSize: %d\n"), BFS_BLOCKSIZE);
|
||||
if (ino_blocks == 1)
|
||||
fprintf(stderr, _("Inodes: %ld (in 1 block)\n"),
|
||||
--
|
||||
2.20.1
|
||||
|
||||
@ -2,7 +2,7 @@
|
||||
|
||||
Name: util-linux
|
||||
Version: 2.35.2
|
||||
Release: 19
|
||||
Release: 20
|
||||
Summary: A random collection of Linux utilities
|
||||
License: GPLv2 and GPLv2+ and LGPLv2+ and BSD with advertising and Public Domain
|
||||
URL: https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git
|
||||
@ -91,6 +91,7 @@ Patch6011: backport-tests-fix-misc-setarch-run-in-a-docker-environment.patc
|
||||
Patch6012: backport-include-c.h-add-helpers-for-unaligned-structure-acce.patch
|
||||
Patch6013: backport-libblkid-drbd-reduce-false-positive.patch
|
||||
Patch6014: backport-libfdisk-fix-fdisk_reread_changes-for-extended-partitions.patch
|
||||
Patch6015: backport-mkfs.bfs-fix-memory-leaks-and-weak-code.patch
|
||||
|
||||
Patch9000: Add-check-to-resolve-uname26-version-test-failed.patch
|
||||
Patch9001: modify-rescuemode-chinese-error.patch
|
||||
@ -443,6 +444,12 @@ fi
|
||||
%{_mandir}/man8/{swapoff.8*,swapon.8*,switch_root.8*,umount.8*,wdctl.8.gz,wipefs.8*,zramctl.8*}
|
||||
|
||||
%changelog
|
||||
* Mon Apr 14 2025 hugel <gengqihu2@h-partners.com> - 2.35.2-20
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
- SUG:NA
|
||||
- DESC:mkfs.bfs fix memory leaks
|
||||
|
||||
* Fri Sep 20 2024 Yu Peng <yupeng@kylinos.cn> - 2.35.2-19
|
||||
- Type:bugfix
|
||||
- CVE:NA
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user