inetutils: fix CVE-2021-40491

The ftp client in GNU Inetutils before 2.2 does not validate addresses
returned by PASV/LSPV responses to make sure they match the server
address. This is similar to CVE-2020-8284 for curl.

References:
https://nvd.nist.gov/vuln/detail/CVE-2021-40491

Patch from:
https://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=58cb043b190fd04effdaea7c9403416b436e50dd

(From OE-Core rev: 22de3b937dda28a6aa4113549f32f36d67b6751d)

Signed-off-by: Minjae Kim <flowergom@gmail.com>
Signed-off-by: Steve Sakoman <steve@sakoman.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

2 files changed, 68 insertions, 0 deletions

diff --git a/meta/recipes-connectivity/inetutils/inetutils/CVE-2021-40491.patch b/meta/recipes-connectivity/inetutils/inetutils/CVE-2021-40491.patch
new file mode 100644
index 0000000000..54252d6bc7
--- /dev/null
+++ b/meta/recipes-connectivity/inetutils/inetutils/CVE-2021-40491.patch
@@ -0,0 +1,67 @@
+From 4e355804d57d5686defc363c70f81e6f58cd08f0 Mon Sep 17 00:00:00 2001
+From: Simon Josefsson <simon@josefsson.org>
+Date: Fri, 17 Dec 2021 21:52:18 -0800
+Subject: [PATCH] ftp: check that PASV/LSPV addresses match.
+
+* NEWS: Mention change.
+* ftp/ftp.c (initconn): Validate returned addresses.
+
+CVE: CVE-2021-40491
+
+Upstream-Status: Backport
+[https://git.savannah.gnu.org/cgit/inetutils.git/commit/?id=58cb043b190fd04effdaea7c9403416b436e50dd]
+
+Signed-off-by: Minjae Kim <flowergom@gmail.com>
+---
+ ftp/ftp.c | 21 +++++++++++++++++++++
+ 1 file changed, 21 insertions(+)
+
+diff --git a/ftp/ftp.c b/ftp/ftp.c
+index 9813586..7c72cb2 100644
+--- a/ftp/ftp.c
++++ b/ftp/ftp.c
+@@ -1344,6 +1344,13 @@ initconn (void)
+                  uint32_t *pu32 = (uint32_t *) &data_addr_sa4->sin_addr.s_addr;
+                  pu32[0] = htonl ( (h[0] << 24) | (h[1] << 16) | (h[2] << 8) | h[3]);
+                }
++               if (data_addr_sa4->sin_addr.s_addr
++                   != ((struct sockaddr_in *) &hisctladdr)->sin_addr.s_addr)
++                 {
++                   printf ("Passive mode address mismatch.\n");
++                   (void) command ("ABOR");    /* Cancel any open connection.  */
++                   goto bad;
++                 }
+            } /* LPSV IPv4 */
+          else /* IPv6 */
+            {
+@@ -1374,6 +1381,13 @@ initconn (void)
+                  pu32[2] = htonl ( (h[8] << 24) | (h[9] << 16) | (h[10] << 8) | h[11]);
+                  pu32[3] = htonl ( (h[12] << 24) | (h[13] << 16) | (h[14] << 8) | h[15]);
+                }
++               if (data_addr_sa6->sin6_addr.s6_addr
++                   != ((struct sockaddr_in6 *) &hisctladdr)->sin6_addr.s6_addr)
++                 {
++                   printf ("Passive mode address mismatch.\n");
++                   (void) command ("ABOR");    /* Cancel any open connection.  */
++                   goto bad;
++                 }
+            } /* LPSV IPv6 */
+        }
+       else /* !EPSV && !LPSV */
+@@ -1394,6 +1408,13 @@ initconn (void)
+                         | ((a2 & 0xff) << 8) | (a3 & 0xff) );
+              data_addr_sa4->sin_port =
+                  htons (((p0 & 0xff) << 8) | (p1 & 0xff));
++             if (data_addr_sa4->sin_addr.s_addr
++                 != ((struct sockaddr_in *) &hisctladdr)->sin_addr.s_addr)
++               {
++                 printf ("Passive mode address mismatch.\n");
++                 (void) command ("ABOR");      /* Cancel any open connection.  */
++                 goto bad;
++               }
+            } /* PASV */
+          else
+            {
+-- 
+2.25.1
+
diff --git a/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb b/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb
index cc9410b94e..f4450e19f4 100644
--- a/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb
+++ b/meta/recipes-connectivity/inetutils/inetutils_1.9.4.bb
@@ -23,6 +23,7 @@ SRC_URI = "${GNU_MIRROR}/inetutils/inetutils-${PV}.tar.gz \
            file://inetutils-only-check-pam_appl.h-when-pam-enabled.patch \
            file://0001-rcp-fix-to-work-with-large-files.patch \
            file://fix-buffer-fortify-tfpt.patch \
+           file://CVE-2021-40491.patch \
 "
 
 SRC_URI[md5sum] = "04852c26c47cc8c6b825f2b74f191f52"