From f3204ae8557f5cb8556ad5a9ab16cdb6fb10b3b5 Mon Sep 17 00:00:00 2001
From: Muhammad Falak R Wani <falakreyaz@gmail.com>
Date: Sun, 29 Dec 2024 18:02:47 +0530
Subject: [PATCH] socat: address CVE-2024-54661

Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
---
 SPECS/socat/CVE-2024-54661.patch | 37 ++++++++++++++++++++++++++++++++
 SPECS/socat/socat.spec           |  8 +++++--
 2 files changed, 43 insertions(+), 2 deletions(-)
 create mode 100644 SPECS/socat/CVE-2024-54661.patch

diff --git a/SPECS/socat/CVE-2024-54661.patch b/SPECS/socat/CVE-2024-54661.patch
new file mode 100644
index 00000000000..33c0f20e99e
--- /dev/null
+++ b/SPECS/socat/CVE-2024-54661.patch
@@ -0,0 +1,37 @@
+From be474a81dc2d9010ac16f9690f97cf7ff68b36d7 Mon Sep 17 00:00:00 2001
+From: Muhammad Falak R Wani <falakreyaz@gmail.com>
+Date: Sun, 29 Dec 2024 17:47:45 +0530
+Subject: [PATCH] CVE-2024-54661: Arbitrary file overwrite in readline.sh
+
+Link: https://repo.or.cz/socat.git/commit/4ee1f31cf80019c5907876576d6dfd49368d660f
+Author:	Gerhard Rieger <gerhard@dest-unreach.org>
+Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
+---
+ readline.sh | 10 ++++++++--
+ 1 file changed, 8 insertions(+), 2 deletions(-)
+
+diff --git a/readline.sh b/readline.sh
+index b6f8438..1045303 100755
+--- a/readline.sh
++++ b/readline.sh
+@@ -22,9 +22,15 @@ if [ "$withhistfile" ]; then
+ else
+     HISTOPT=
+ fi
+-mkdir -p /tmp/$USER || exit 1
+ #
+ #
+ 
+-exec socat -d readline"$HISTOPT",noecho='[Pp]assword:' exec:"$PROGRAM",sigint,pty,setsid,ctty,raw,echo=0,stderr 2>/tmp/$USER/stderr2
++if test -w .; then
++    STDERR=./socat-readline.${1##*/}.log
++    rm -f $STDERR
++else
++    STDERR=/dev/null
++fi
++
++exec socat -d readline"$HISTOPT",noecho='[Pp]assword:' exec:"$PROGRAM",sigint,pty,setsid,ctty,raw,echo=0,stderr 2>$STDERR
+ 
+-- 
+2.40.1
+
diff --git a/SPECS/socat/socat.spec b/SPECS/socat/socat.spec
index f6902ed92ab..2c1e8e6d5c7 100644
--- a/SPECS/socat/socat.spec
+++ b/SPECS/socat/socat.spec
@@ -1,19 +1,20 @@
 Summary:        Multipurpose relay (SOcket CAT)
 Name:           socat
 Version:        1.7.4.3
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        GPL2
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
 Group:          Applications/Internet
 URL:            http://www.dest-unreach.org/socat
 Source0:        http://www.dest-unreach.org/socat/download/%{name}-%{version}.tar.gz
+Patch0:         CVE-2024-54661.patch
 
 %description
 Socat is a command line based utility that establishes two bidirectional byte streams and transfers data between them. Because the streams can be constructed from a large set of different types of data sinks and sources (see address types), and because lots of address options may be applied to the streams, socat can be used for many different purposes.
 
 %prep
-%setup -q
+%autosetup -p1
 
 %build
 ./configure --prefix=%{_prefix} --sysconfdir=%{_sysconfdir}
@@ -36,6 +37,9 @@ make %{?_smp_mflags} test
 %{_mandir}/man1/*
 
 %changelog
+* Sun Dec 29 2024 Muhammad Falak <mwani@microsoft.com> - 1.7.4.3-2
+- Patch CVE-2024-54661
+
 * Mon Jan 24 2022 Neha Agarwal <nehaagarwal@microsoft.com> - 1.7.4.3-1
 - Update to version 1.7.4.3.