commit: 0cde6b189cfc5e0128f52e517a8a7868cf8278d0 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Tue Jul 13 19:08:47 2021 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Tue Jul 13 21:15:13 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0cde6b18
net-libs/libslirp: remove unused patch(es) Closes: https://github.com/gentoo/gentoo/pull/21628 Package-Manager: Portage-3.0.20, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../libslirp-4.3.1-bug-756910-check-pkt_len.patch | 48 ---------------------- 1 file changed, 48 deletions(-) diff --git a/net-libs/libslirp/files/libslirp-4.3.1-bug-756910-check-pkt_len.patch b/net-libs/libslirp/files/libslirp-4.3.1-bug-756910-check-pkt_len.patch deleted file mode 100644 index aef7f19ba13..00000000000 --- a/net-libs/libslirp/files/libslirp-4.3.1-bug-756910-check-pkt_len.patch +++ /dev/null @@ -1,48 +0,0 @@ -From: Prasad J Pandit <p...@fedoraproject.org> -Date: Thu, 26 Nov 2020 13:57:06 +0000 -Subject: [PATCH] slirp: check pkt_len before reading protocol header - -While processing ARP/NCSI packets in 'arp_input' or 'ncsi_input' -routines, ensure that pkt_len is large enough to accommodate the -respective protocol headers, lest it should do an OOB access. -Add check to avoid it. - -Reported-by: Qiuhao Li @outlook.com; -Signed-off-by: Prasad J Pandit <p...@fedoraproject.org> ---- - src/ncsi.c | 4 ++++ - src/slirp.c | 4 ++++ - 2 files changed, 8 insertions(+) - -diff --git a/src/ncsi.c b/src/ncsi.c -index 3c1dfef..75dcc08 100644 ---- a/src/ncsi.c -+++ b/src/ncsi.c -@@ -148,6 +148,10 @@ void ncsi_input(Slirp *slirp, const uint8_t *pkt, int pkt_len) - uint32_t checksum; - uint32_t *pchecksum; - -+ if (pkt_len < ETH_HLEN + sizeof(struct ncsi_pkt_hdr)) { -+ return; /* packet too short */ -+ } -+ - memset(ncsi_reply, 0, sizeof(ncsi_reply)); - - memset(reh->h_dest, 0xff, ETH_ALEN); -diff --git a/src/slirp.c b/src/slirp.c -index 9bead0c..abb6f9a 100644 ---- a/src/slirp.c -+++ b/src/slirp.c -@@ -860,6 +860,10 @@ static void arp_input(Slirp *slirp, const uint8_t *pkt, int pkt_len) - return; - } - -+ if (pkt_len < ETH_HLEN + sizeof(struct slirp_arphdr)) { -+ return; /* packet too short */ -+ } -+ - ar_op = ntohs(ah->ar_op); - switch (ar_op) { - case ARPOP_REQUEST: --- -2.28.0
