diff options
| author | Michael Forney <mforney@mforney.org> | 2020-04-04 22:07:03 -0700 |
|---|---|---|
| committer | Michael Forney <mforney@mforney.org> | 2020-04-04 22:09:03 -0700 |
| commit | a684393b702d2c6977e76584583ea9a15f31b7d4 (patch) | |
| tree | 5f5a5c7141918f3fabd44e76ad792333302f9aa1 /pkg/e2fsprogs | |
| parent | 33e9115a2513430addc328937eb9d96d6f71c877 (diff) | |
e2fsprogs: Avoid pointer arithmetic on `void *`
Diffstat (limited to 'pkg/e2fsprogs')
| -rw-r--r-- | pkg/e2fsprogs/patch/0001-libext2fs-avoid-pointer-arithmetic-on-void.patch | 29 | ||||
| -rw-r--r-- | pkg/e2fsprogs/ver | 2 |
2 files changed, 30 insertions, 1 deletions
diff --git a/pkg/e2fsprogs/patch/0001-libext2fs-avoid-pointer-arithmetic-on-void.patch b/pkg/e2fsprogs/patch/0001-libext2fs-avoid-pointer-arithmetic-on-void.patch new file mode 100644 index 00000000..5e026447 --- /dev/null +++ b/pkg/e2fsprogs/patch/0001-libext2fs-avoid-pointer-arithmetic-on-void.patch @@ -0,0 +1,29 @@ +From 01d05e00694f0488236ac766a5fcfa37a17bec64 Mon Sep 17 00:00:00 2001 +From: Michael Forney <mforney@mforney.org> +Date: Sat, 4 Apr 2020 21:38:29 -0700 +Subject: [PATCH] libext2fs: avoid pointer arithmetic on `void *` + +The pointer operand to the binary `+` operator must be to a complete +object type. + +Signed-off-by: Michael Forney <mforney@mforney.org> +--- + lib/ext2fs/csum.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/ext2fs/csum.c b/lib/ext2fs/csum.c +index a7172580..54b53a3c 100644 +--- a/lib/ext2fs/csum.c ++++ b/lib/ext2fs/csum.c +@@ -274,7 +274,7 @@ static errcode_t __get_dirent_tail(ext2_filsys fs, + rec_len = translate(d->rec_len); + } + +- if ((void *)d > ((void *)dirent + fs->blocksize)) ++ if ((char *)d > ((char *)dirent + fs->blocksize)) + return EXT2_ET_DIR_CORRUPTED; + if (d != top) + return EXT2_ET_DIR_NO_SPACE_FOR_CSUM; +-- +2.26.0 + diff --git a/pkg/e2fsprogs/ver b/pkg/e2fsprogs/ver index a68d7a73..ac96bb6c 100644 --- a/pkg/e2fsprogs/ver +++ b/pkg/e2fsprogs/ver @@ -1 +1 @@ -1.45.6 r0 +1.45.6 r1 |