From 2ca25ad1e14ad3f212f06337bf18d04b2a6f1f09 Mon Sep 17 00:00:00 2001
From: xiechengliang <xiechengliang1@huawei.com>
Date: Fri, 19 Nov 2021 19:25:36 +0800
Subject: [PATCH] busybox: fix CVE-2021-42373

Signed-off-by: xiechengliang <xiechengliang1@huawei.com>
---
 backport-fix-CVE-2021-42373.patch | 29 +++++++++++++++++++++++++++++
 busybox.spec                      | 11 ++++++++++-
 2 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 backport-fix-CVE-2021-42373.patch

diff --git a/backport-fix-CVE-2021-42373.patch b/backport-fix-CVE-2021-42373.patch
new file mode 100644
index 0000000..2edec1b
--- /dev/null
+++ b/backport-fix-CVE-2021-42373.patch
@@ -0,0 +1,29 @@
+From 6dc5bd57af2f5cc6b8c953d2b223d3b012b2400b Mon Sep 17 00:00:00 2001
+From: xiechengliang <xiechengliang1@huawei.com>
+Date: Fri, 19 Nov 2021 18:34:10 +0800
+Subject: [PATCH] busybox: fix CVE-2021-42373
+
+backport from upstream:
+https://git.busybox.net/busybox/commit/?id=4d4fc5ca5ee4faae5dc4237f801d9527a3fb20cc
+
+Signed-off-by: xiechengliang <xiechengliang1@huawei.com>
+---
+ miscutils/man.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/miscutils/man.c b/miscutils/man.c
+index 722f6641e..d319e8bba 100644
+--- a/miscutils/man.c
++++ b/miscutils/man.c
+@@ -324,7 +324,7 @@ int man_main(int argc UNUSED_PARAM, char **argv)
+ 
+ 	/* is 1st ARG a SECTION? */
+ 	sec_list = conf_sec_list;
+-	if (is_section_name(conf_sec_list, *argv)) {
++	if (is_section_name(conf_sec_list, *argv) && argv[1]) {
+ 		/* yes */
+ 		sec_list = *argv++;
+ 	}
+-- 
+2.27.0
+
diff --git a/busybox.spec b/busybox.spec
index 00ec7ff..379d718 100644
--- a/busybox.spec
+++ b/busybox.spec
@@ -4,7 +4,7 @@
 %endif
 
 %if "%{!?RELEASE:1}"
-%define RELEASE 9
+%define RELEASE 10
 %endif
 
 Name: busybox
@@ -19,6 +19,9 @@ Source1: busybox-static.config
 Source2: busybox-petitboot.config
 Source3: busybox-dynamic.config
 
+#backport
+Patch6000: backport-fix-CVE-2021-42373.patch
+
 BuildRoot:      %_topdir/BUILDROOT
 #Dependency
 BuildRequires: gcc glibc-static
@@ -93,6 +96,12 @@ install -m 644 docs/busybox.dynamic.1 $RPM_BUILD_ROOT/%{_mandir}/man1/busybox.1
 %{_mandir}/man1/busybox.petitboot.1.gz
 
 %changelog
+* Fri Nov 19 2021 xiechengliang <xiechengliang1@huawei.com> - 1:1.33.1-10
+- Type:CVE
+- CVE:CVE-2021-42373
+- SUG:NA
+- DESC:fix CVE-2021-42373
+
 * Fri Aug 13 2021 jikui <jikui2@huawei.com> - 1:1.33.1-9
 - Type:enhancement
 - Id:NA
-- 
Gitee