Merge ~bryce/ubuntu/+source/nmap:sru-lp1908223-focal into ubuntu/+source/nmap:ubuntu/focal-devel

[Bryce Harrington]

SRUs a patch to fix an assertion crash that none of us seem to be able to reproduce but several community members have. The reporter indicates running it in a loop several hundred times might trigger it; I haven't attempted that but might be worth a try. In any case, we're going to rely on the community to perform the testing.

The patch itself is just a couple code lines, that only stops the clock when it's running. That seems straightforward and unlikely to lead to regression. Please doublecheck that my SRU text in the bug report makes sense.

[Athos Ribeiro (athos-ribeiro)]

Although I could not reproduce the issue, the patch is short and simple, and the SRU text makes sense (in special the test plan). The package builds fine. Unfortunately, there are no dep8 tests for the package.

LGTM. Thanks, Bryce!

review: Approve

[git-ubuntu bot (git-ubuntu-bot)]

Approvers: bryce, athos-ribeiro
Uploaders: bryce, athos-ribeiro
MP auto-approved

review: Approve

[Bryce Harrington (bryce)]

Thanks,

Successfully signed dsc, buildinfo, changes files
Vcs-Git: https://git.launchpad.net/~bryce/ubuntu/+source/nmap
Vcs-Git-Commit: 8f66656ff67b64e6925d93e22a8498b8d80ba4f5
Vcs-Git-Ref: refs/heads/sru-lp1908223-focal
$ dput ubuntu ../nmap_7.80+dfsg1-2ubuntu0.1_source.changes
gpg: ../nmap_7.80+dfsg1-2ubuntu0.1_source.changes: Valid signature from E603B2578FB8F0FB
gpg: ../nmap_7.80+dfsg1-2ubuntu0.1.dsc: Valid signature from E603B2578FB8F0FB
Checking signature on .changes
Checking signature on .dsc
Uploading to ubuntu (via ftp to upload.ubuntu.com):
  Uploading nmap_7.80+dfsg1-2ubuntu0.1.dsc: done.
  Uploading nmap_7.80+dfsg1-2ubuntu0.1.debian.tar.xz: done.
  Uploading nmap_7.80+dfsg1-2ubuntu0.1_source.buildinfo: done.
  Uploading nmap_7.80+dfsg1-2ubuntu0.1_source.changes: done.
Successfully uploaded packages.

diff --git a/debian/changelog b/debian/changelog
index b5d8922..ad6aa42 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+nmap (7.80+dfsg1-2ubuntu0.1) focal; urgency=medium
+
+  * d/p/avoid-assertion-failure-when-unsolicited-arp-response-received.patch:
+    Check if a timeout clock is running before attempting to stop it.
+    (LP: #1908223)
+
+ -- Bryce Harrington <[e-mail]>  Mon, 30 Jan 2023 01:33:09 -0800
+
 nmap (7.80+dfsg1-2build1) focal; urgency=medium
 
   * No-change rebuild for libgcc-s1 package name change.
diff --git a/debian/control b/debian/control
index c6abfcb..cb064cf 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,8 @@
 Source: nmap
 Section: net
 Priority: optional
-Maintainer: Debian Security Tools <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Debian Security Tools <[e-mail]>
 Uploaders: Hilko Bengen <[e-mail]>,
            Samuel Henrique <[e-mail]>
 Build-Depends: bison,
diff --git a/debian/patches/avoid-assertion-failure-when-unsolicited-arp-response-received.patch b/debian/patches/avoid-assertion-failure-when-unsolicited-arp-response-received.patch
 new file mode 100644
index 0000000..84de270
--- /dev/null
+++ b/debian/patches/avoid-assertion-failure-when-unsolicited-arp-response-received.patch
@@ -0,0 +1,38 @@
+From 33f421fd6e68fcb8ed50071661d9704717c81b2b Mon Sep 17 00:00:00 2001
+From: dmiller <dmiller@e0a8ed71-7df4-0310-8962-fdc924857419>
+Date: Tue, 3 Dec 2019 17:04:13 +0000
+Subject: [PATCH] Avoid assertion failure when unsolicited ARP response
+ received
+
+We probably want a more explicit handling of the case where we get an
+ARP response to a request that we did not send (system's own, or another
+Nmap scan running at the same time). In any case, this ought to solve
+the crashes reported as #1797 and #1764.
+
+Origin: upstream, https://github.com/nmap/nmap/commit/33f421fd6e68fcb8ed50071661d9704717c81b2b
+Bug: https://github.com/nmap/nmap/issues/1797
+Bug: https://github.com/nmap/nmap/issues/1764
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/nmap/+bug/1908223
+Last-Update: 2023-01-12
+---
+ scan_engine.cc | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/scan_engine.cc b/scan_engine.cc
+index bd73cc8ead..7a4766da26 100644
+--- a/scan_engine.cc
++++ b/scan_engine.cc
+@@ -1275,7 +1275,12 @@ int UltraScanInfo::removeCompletedHosts() {
+       }
+       if (timedout)
+         gstats->num_hosts_timedout++;
+-      hss->target->stopTimeOutClock(&now);
++      /* We may have received an ARP response before we sent a probe, which
++       * would mean the timeout clock is not running. Avoid an assertion
++       * failure here by checking first.  */
++      if (hss->target->timeOutClockRunning()) {
++        hss->target->stopTimeOutClock(&now);
++      }
+     }
+   }
+   return hostsRemoved;
diff --git a/debian/patches/series b/debian/patches/series
index abe4a88..d61c1e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0003-Link-against-lua-lpeg.patch
 0005-ncat-manpage-self-reference.patch
 0004-Python3-port-of-ndiff.patch
+avoid-assertion-failure-when-unsolicited-arp-response-received.patch