deleted file mode 100644

@@ -1,83 +0,0 @@

-From 2c933ecba3bb1d3041a5a7a53a7b4078a6003413 Mon Sep 17 00:00:00 2001

-From: Craig Small <csmall@dropbear.xyz>

-Date: Thu, 10 Aug 2023 21:18:38 +1000

-Subject: [PATCH] ps: Fix possible buffer overflow in -C option

-

-ps allocates memory using malloc(length of arg * len of struct).

-In certain strange circumstances, the arg length could be very large

-and the multiplecation will overflow, allocating a small amount of

-memory.

-

-Subsequent strncpy() will then write into unallocated memory.

-The fix is to use calloc. It's slower but this is a one-time

-allocation. Other malloc(x * y) calls have also been replaced

-by calloc(x, y)

-

-References:

- https://www.freelists.org/post/procps/ps-buffer-overflow-CVE-20234016

- https://nvd.nist.gov/vuln/detail/CVE-2023-4016

- https://gitlab.com/procps-ng/procps/-/issues/297

- https://bugs.debian.org/1042887

-

-Signed-off-by: Craig Small <csmall@dropbear.xyz>

-

-[srish: - resolved hunk failure in NEWS

-        - corrected file path for parser.c]

-Signed-off-by: Srish Srinivasan <srish.srinivasan@broadcom.com>

- NEWS            | 1 +

- ps/parser.c | 8 ++++----

- 2 files changed, 5 insertions(+), 4 deletions(-)

-

-diff --git a/NEWS b/NEWS

-index c89fd2e..35da95a 100644

-+++ b/NEWS

-@@ -1,5 +1,6 @@

- procps-ng-NEXT

- ---------------

-+  * ps: Fix buffer overflow in -C option CVE-2023-4016     Debian #1042887, issue #297

-   * Rename pwait to pidwait

-   * free: Add committed line option                        merge #25

-   * free: Fix -h --si combined options                     issue #133, #223

-diff --git a/src/ps/parser.c b/src/ps/parser.c

-index 248aa741..15873dfa 100644

-+++ b/ps/parser.c

-@@ -189,7 +189,6 @@ static const char *parse_list(const char *arg, const char *(*parse_fn)(char *, s

-   const char *err;       /* error code that could or did happen */

-   /*** prepare to operate ***/

-   node = xmalloc(sizeof(selection_node));

--  node->u = xmalloc(strlen(arg)*sizeof(sel_union)); /* waste is insignificant */

-   node->n = 0;

-   buf = strdup(arg);

-   /*** sanity check and count items ***/

-@@ -210,6 +209,7 @@ static const char *parse_list(const char *arg, const char *(*parse_fn)(char *, s

-   } while (*++walk);

-   if(need_item) goto parse_error;

-   node->n = items;

-+  node->u = xcalloc(items, sizeof(sel_union));

-   /*** actually parse the list ***/

-   walk = buf;

-   while(items--){

-@@ -1050,15 +1050,15 @@ static const char *parse_trailing_pids(void){

-   thisarg = ps_argc - 1;   /* we must be at the end now */

- 

-   pidnode = xmalloc(sizeof(selection_node));

--  pidnode->u = xmalloc(i*sizeof(sel_union)); /* waste is insignificant */

-+  pidnode->u = xcalloc(i, sizeof(sel_union)); /* waste is insignificant */

-   pidnode->n = 0;

- 

-   grpnode = xmalloc(sizeof(selection_node));

--  grpnode->u = xmalloc(i*sizeof(sel_union)); /* waste is insignificant */

-+  grpnode->u = xcalloc(i,sizeof(sel_union)); /* waste is insignificant */

-   grpnode->n = 0;

- 

-   sidnode = xmalloc(sizeof(selection_node));

--  sidnode->u = xmalloc(i*sizeof(sel_union)); /* waste is insignificant */

-+  sidnode->u = xcalloc(i, sizeof(sel_union)); /* waste is insignificant */

-   sidnode->n = 0;

- 

-   while(i--){

-GitLab

@@ -1,7 +1,7 @@

 Summary:        Programs for monitoring processes

 Name:           procps-ng

-Version:        4.0.0

-Release:        4%{?dist}

+Version:        4.0.4

+Release:        1%{?dist}

 License:        GPLv2

 URL:            https://sourceforge.net/projects/procps-ng

 Group:          Applications/System

@@ -9,9 +9,7 @@ Vendor:         VMware, Inc.

 Distribution:   Photon

 Source0: https://sourceforge.net/projects/procps-ng/files/Production/%{name}-%{version}.tar.xz

-%define sha512 %{name}=1749375f72fdede58b394a7b64127b7ef7f432854995669c73802d5d626e611d23b0f6eca85106590a0b6cc21057c7c389c459dbff8f02ec52ed506723330541

-

-Patch0:        CVE-2023-4016.patch

+%define sha512 %{name}=94375544e2422fefc23d7634063c49ef1be62394c46039444f85e6d2e87e45cfadc33accba5ca43c96897b4295bfb0f88d55a30204598ddb26ef66f0420cefb4

 BuildRequires: ncurses-devel

@@ -46,22 +44,30 @@ if [ %{_host} != %{_build} ]; then

   export ac_cv_func_realloc_0_nonnull=yes

 fi

-%configure --docdir=%{_docdir}/%{name}-%{version} \

-           --disable-static \

-           --disable-kill \

-           --disable-silent-rules

+%configure \

+  --docdir=%{_docdir}/%{name}-%{version} \

+  --disable-static \

+  --disable-kill \

+  --disable-silent-rules

 %make_build

 %install

 %make_install %{?_smp_mflags}

-ln -srv %{_bindir}/pidof %{buildroot}%{_sbindir}/pidof

+ln -srv %{buildroot}%{_bindir}/pidof %{buildroot}%{_sbindir}/pidof

+

+rm -rf %{buildroot}%{_mandir}/de/ \

+       %{buildroot}%{_mandir}/fr/ \

+       %{buildroot}%{_mandir}/pl/ \

+       %{buildroot}%{_mandir}/pt_BR/ \

+       %{buildroot}%{_mandir}/ro/ \

+       %{buildroot}%{_mandir}/sv/ \

+       %{buildroot}%{_mandir}/uk/

+

 %find_lang %{name}

-%if 0%{?with_check}

 %check

-make %{?_smp_mflags} check

-%endif

+%make_build check

 %clean

 rm -rf %{buildroot}

@@ -88,36 +94,25 @@ rm -rf %{buildroot}

 %{_sbindir}/sysctl

 %{_sbindir}/pidof

 %_datadir/locale/*

-%{_docdir}/procps-ng-*/*

+%{_docdir}/%{name}-*/*

 %{_mandir}/man8/*

 %{_mandir}/man1/*

 %{_mandir}/man5/*

-%{_libdir}/libproc-2.so.*

+%{_libdir}/*.so.*

 %files devel

 %defattr(-,root,root)

-%{_libdir}/libproc-2.so

-%{_includedir}/procps/diskstats.h

-%{_includedir}/procps/meminfo.h

-%{_includedir}/procps/misc.h

-%{_includedir}/procps/pids.h

-%{_includedir}/procps/slabinfo.h

-%{_includedir}/procps/stat.h

-%{_includedir}/procps/vmstat.h

-%{_includedir}/procps/xtra-procps-debug.h

-%{_mandir}/man3/*

-%{_libdir}/pkgconfig/*.pc

-%exclude %{_mandir}/pl/*

-%exclude %{_mandir}/pt_BR/*

-%exclude %{_mandir}/sv/*

-%exclude %{_mandir}/uk/*

-%exclude %{_mandir}/de/*

-%exclude %{_mandir}/fr/*

+%{_includedir}/libproc2/*.h

+%{_libdir}/pkgconfig/libproc2.pc

+%{_libdir}/*.so

+%{_mandir}/man3/*.gz

 %files lang -f %{name}.lang

 %defattr(-,root,root)

 %changelog

+* Mon Apr 08 2024 Shreenidhi Shedi <shreenidhi.shedi@broadcom.com> 4.0.4-1

+- Upgrade to v4.0.4

 * Mon Jan 22 2024 Srish Srinivasan <srish.srinivasan@broadcom.com> 4.0.0-4

 - Patched CVE-2023-4016

 * Fri Jun 09 2023 Nitesh Kumar <kunitesh@vmware.com> 4.0.0-3