fix CVE-2022-48554
(cherry picked from commit 11a644c04924eb5c6c997e123535b8649ab53a7c)
This commit is contained in:
parent
a09ca3e125
commit
47782ba1b8
34
CVE-2022-48554.patch
Normal file
34
CVE-2022-48554.patch
Normal file
@ -0,0 +1,34 @@
|
|||||||
|
From c4d10f78b3946fc32624d78c038e9731ca2ce454 Mon Sep 17 00:00:00 2001
|
||||||
|
From: liningjie <liningjie@xfusion.com>
|
||||||
|
Date: Tue, 15 Aug 2023 00:54:28 +0800
|
||||||
|
Subject: [PATCH] PR/310: p870613: Don't use strlcpy to copy the string, it
|
||||||
|
will try to scan the source string to find out how much space is needed the
|
||||||
|
source string might not be NUL terminated.
|
||||||
|
|
||||||
|
---
|
||||||
|
src/funcs.c | 9 ++++++---
|
||||||
|
1 file changed, 6 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/src/funcs.c b/src/funcs.c
|
||||||
|
index 33c3f85..295fb75 100644
|
||||||
|
--- a/src/funcs.c
|
||||||
|
+++ b/src/funcs.c
|
||||||
|
@@ -54,9 +54,12 @@ FILE_RCSID("@(#)$File: funcs.c,v 1.122 2021/06/30 10:08:48 christos Exp $")
|
||||||
|
protected char *
|
||||||
|
file_copystr(char *buf, size_t blen, size_t width, const char *str)
|
||||||
|
{
|
||||||
|
- if (++width > blen)
|
||||||
|
- width = blen;
|
||||||
|
- strlcpy(buf, str, width);
|
||||||
|
+ if (blen == 0)
|
||||||
|
+ return buf;
|
||||||
|
+ if (width >= blen)
|
||||||
|
+ width = blen - 1;
|
||||||
|
+ memcpy(buf, str, width);
|
||||||
|
+ buf[width] = '\0';
|
||||||
|
return buf;
|
||||||
|
}
|
||||||
|
|
||||||
|
--
|
||||||
|
2.33.0
|
||||||
|
|
||||||
@ -1,6 +1,6 @@
|
|||||||
Name: file
|
Name: file
|
||||||
Version: 5.41
|
Version: 5.41
|
||||||
Release: 2
|
Release: 3
|
||||||
Summary: A tool to identify the type of a particular file type
|
Summary: A tool to identify the type of a particular file type
|
||||||
License: BSD
|
License: BSD
|
||||||
URL: http://www.darwinsys.com/file/
|
URL: http://www.darwinsys.com/file/
|
||||||
@ -8,6 +8,7 @@ Source0: ftp://ftp.astron.com/pub/file/file-%{version}.tar.gz
|
|||||||
|
|
||||||
Patch1: 0001-file-localmagic.patch
|
Patch1: 0001-file-localmagic.patch
|
||||||
Patch2: 0002-fix-typos-fxlb.patch
|
Patch2: 0002-fix-typos-fxlb.patch
|
||||||
|
Patch3: CVE-2022-48554.patch
|
||||||
|
|
||||||
Requires: %{name}-libs = %{version}-%{release}
|
Requires: %{name}-libs = %{version}-%{release}
|
||||||
BuildRequires: autoconf automake libtool zlib-devel make
|
BuildRequires: autoconf automake libtool zlib-devel make
|
||||||
@ -131,6 +132,9 @@ make -C tests check
|
|||||||
%{python3_sitelib}/__pycache__/*
|
%{python3_sitelib}/__pycache__/*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Wed Aug 23 2023 liningjie <liningjie@xfusion.com> - 5.41-3
|
||||||
|
- fix CVE-2022-48554
|
||||||
|
|
||||||
* Wed Oct 19 2022 lihaoxiang <lihaoxiang9@huawei.com> - 5.41-2
|
* Wed Oct 19 2022 lihaoxiang <lihaoxiang9@huawei.com> - 5.41-2
|
||||||
- fix typos fxlb
|
- fix typos fxlb
|
||||||
|
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user