packages/lsof
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle ffff:ffff in ipv6 addr correctly

Browse Source
This commit is contained in:
yangshaoxing1001 2020-10-19 14:24:22 +08:00
parent 181af4285f
commit 39cfd6d534
2 changed files with 92 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

84
Handle-ffff-ffff-in-ipv6-addr-correctly.patch Normal file
View File

@ -0,0 +1,84 @@
From e64dc10ea1d5be38681191d9f4d2aa9018ab59dc Mon Sep 17 00:00:00 2001
From: Masatake YAMATO <yamato@redhat.com>
Date: Sun, 4 Oct 2020 03:50:26 +0900
Subject: [PATCH] [linux] handle ffff:ffff in ipv6 addr correctly
Close #102
Close #109
The listen address and port of an AF_INET6 socket were not display if
the socket listened at an ipv6 address including ffff:ffff.
Here is a command session demonstrating the bug:
# ip -6 addr add abcd:ef10:ffff:ffff:ffff:ffff:ffff:ff62 dev lo
# nc -6 -l abcd:ef10:ffff:ffff:ffff:ffff:ffff:ff62 8888 &
[1] 6762
# ./lsof -p 6762 -a -d fd -P -n
COMMAND PID USER FD TYPE DEVICE SIZE/OFF NODE NAME
nc 6762 yamato 0u CHR 136,6 0t0 9 /dev/pts/6
nc 6762 yamato 1u CHR 136,6 0t0 9 /dev/pts/6
nc 6762 yamato 2u CHR 136,6 0t0 9 /dev/pts/6
nc 6762 yamato 3u sock 0,9 0t0 5833594 protocol: TCPv6
The last line should be:
nc 6762 yamato 3u IPv6 5833594 0t0 TCP [abcd:ef10:ffff:ffff:ffff:ffff:ffff:ff62]:8888 (LISTEN)
The original code decoding an ipv6 address uses UINT32_MAX constant
incorrect way.
@zhrf2020 reported this bug in #102.
The test case is based on the report.
@zhrf2020 provided the initial version of fix, #109.
This change is based on the version.
---
dialects/linux/dsock.c | 33 ++++++++++++-
1 files changed, 31 insertions(+), 2 deletions(-)
diff --git a/dialects/linux/dsock.c b/dialects/linux/dsock.c
index 4b71460..0aaaf6d 100644
--- a/dialects/linux/dsock.c
+++ b/dialects/linux/dsock.c
@@ -3632,9 +3632,38 @@ net6a2in6(as, ad)
(void) strncpy(buf, as, 8);
buf[8] = '\0';
ep = (char *)NULL;
- if ((ad->s6_addr32[i] = (uint32_t)strtoul(buf, &ep, 16))
- == (uint32_t)UINT32_MAX || !ep || *ep)
+
+ errno = 0;
+ unsigned long ul_addr = strtoul(buf, &ep, 16);
+ if (!ep || *ep)
+ break;
+ else if (ul_addr == ULONG_MAX && errno == ERANGE)
+ {
+ /* Quoted from strtoul(3)
+ ---------------------------------------------------
+ The strtoul() function returns either the result of
+ the conversion or, if there was a leading minus
+ sign, the negation of the result of the conversion
+ represented as an unsigned value, unless the
+ original (nonnegated) value would overflow; in the
+ latter case, strtoul() returns ULONG_MAX and sets
+ errno to ERANGE.
+ ---------------------------------------------------
+ NOTE: even if the value doesn't overflow, a
+ negative is not acceptable. */
break;
+ }
+ else if (ul_addr > (unsigned long)UINT32_MAX)
+ {
+ /* This will never happen:
+ The maximum length of BUF is 8 characters.
+ The possible maximum value represented by BUF is
+ "FFFFFFFF". This is UINT32_MAX.
+ If you agree with what I write here, make a pull
+ request for removing this block. */
+ break;
+ }
+ ad->s6_addr32[i] = (uint32_t)ul_addr;
}
return((*as || (i != 4) || len) ? 1 : 0);
}

12
lsof.spec
View File

@ -1,13 +1,14 @@
Name: lsof
Version: 4.93.2
Release: 3
Release: 4
Summary: A tool for list open files
License: zlib and Sendmail and LGPLv2+
URL: https://people.freebsd.org/~abe/
Source0: https://github.com/lsof-org/%{name}/archive/%{version}.tar.gz#/%{name}-%{version}.tar.gz
Patch6002: 0050-endpoint-pipe-fix-list-the-same-fd-in-a-different-pr.patch
Patch6003: 0052-endpoint-pty-bug-fix-list-the-same-fd-in-a-different.patch
Patch6004: 0060-endpoint-pseudoterminal-bug-fix-fix-wrong-Unix98-PTY.patch
Patch0: 0050-endpoint-pipe-fix-list-the-same-fd-in-a-different-pr.patch
Patch1: 0052-endpoint-pty-bug-fix-list-the-same-fd-in-a-different.patch
Patch2: 0060-endpoint-pseudoterminal-bug-fix-fix-wrong-Unix98-PTY.patch
Patch3: Handle-ffff-ffff-in-ipv6-addr-correctly.patch
BuildRequires: gcc git libtirpc-devel libselinux-devel
@ -45,6 +46,9 @@ install -p -m 0644 Lsof.8 %{buildroot}/%{_mandir}/man1/lsof.1
%{_mandir}/man*/*
%changelog
* Mon Oct 19 2020 yangshaoxing <yangshaoxing3@huawei.com> - 4.93.2-4
- Handle ffff:ffff in ipv6 addr correctly
* Fri Jan 10 2020 Yeqing Peng <pengyeqing@huawei.com> - 4.93.2-3
- delete unused file