Fix an error in arpwatch-devlookup.patch that could cause a null pointer dereference on startup. Implements the suggestion of PR#1, “Update arpwatch-devlookup.patch to correctly open a named interface”.

This commit is contained in:
Benjamin A. Beasley 2021-04-24 09:07:29 -04:00
commit 4f047b4d8e
2 changed files with 8 additions and 4 deletions

View file

@ -7,7 +7,7 @@ unsupported datalink types.
diff -Naur arpwatch-3.1-original/arpwatch.c arpwatch-3.1/arpwatch.c
--- arpwatch-3.1-original/arpwatch.c 2019-11-30 13:35:23.000000000 -0500
+++ arpwatch-3.1/arpwatch.c 2020-11-10 11:32:58.121857063 -0500
+++ arpwatch-3.1/arpwatch.c 2021-04-24 09:02:50.762535242 -0400
@@ -161,6 +161,8 @@
RETSIGTYPE die(int);
int isbogon(u_int32_t);
@ -57,10 +57,9 @@ diff -Naur arpwatch-3.1-original/arpwatch.c arpwatch-3.1/arpwatch.c
- timeout = 1000;
- pd = pcap_open_live(interface, snaplen, promisc, timeout,
- errbuf);
- if (pd == NULL) {
if (pd == NULL) {
- lg(LOG_ERR, "pcap open %s: %s", interface, errbuf);
- exit(1);
+ if (pd != NULL) {
+ if (!try_open_live(&pd, interface, promisc)) {
+ exit(1);
+ }

View file

@ -1,7 +1,7 @@
Name: arpwatch
Epoch: 14
Version: 3.1
Release: 11%{?dist}
Release: 12%{?dist}
Summary: Network monitoring tools for tracking IP addresses on a network
License: BSD with advertising
@ -221,6 +221,11 @@ exit 0
%changelog
* Sat Apr 24 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 14:3.1-12
- Fix an error in arpwatch-devlookup.patch that could cause a null pointer
dereference on startup. Implements the suggestion of PR#1, “Update
arpwatch-devlookup.patch to correctly open a named interface”.
* Tue Apr 06 2021 Benjamin A. Beasley <code@musicinmybrain.net> - 14:3.1-11
- Do not use %%exclude for unpackaged files (RPM 4.17 compatibility)
- generate ethercodes.dat from latest oui.csv