From nobody Thu Apr 14 13:47:17 2022
X-Original-To: dev-commits-src-main@mlmmj.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 833CC1B4AEAE;
Thu, 14 Apr 2022 13:47:17 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
client-signature RSA-PSS (4096 bits) client-digest SHA256)
(Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK))
by mx1.freebsd.org (Postfix) with ESMTPS id 4KfLP13DJlz4hJ4;
Thu, 14 Apr 2022 13:47:17 +0000 (UTC)
(envelope-from git@FreeBSD.org)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim;
t=1649944037;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=JXFZvaM5IiiFdBeKVdtlP0O1MZwgRVXLPSqCAFP4L+M=;
b=T7ezCGr2oUx1kEJ8t5PYX0vHlDQaPzMjVfaOYRa6fNYrOuKOq6z4Ztjqq6+1iGXUzoRlk7
vHszO6fgVImweARDgQhNhMsonE1GpAwNbOBI3XkIu22AWV4niKs3D3fQlwN9wD+aJABYZ6
ZHMv0NtqrQWc9S+BZmwBT4okOqnc2Dv5Gc0e1cFA2uQWQDoP07OOhroXGVOxPqzc2LX7yp
gfUkyTIn9gqt0UnJqiXedXO7YeuJUqf+y9aq1ZK7vFV9uS1jB26DFGkWjSgQrGQjtbAQ+b
IvJVwwHy5OS7ujf0a3EZutTU7hTz/BG9tQ7fRlJBxj0fPbUahysJbgPdwGIyog==
Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(Client did not present a certificate)
by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 49FA021824;
Thu, 14 Apr 2022 13:47:17 +0000 (UTC)
(envelope-from git@FreeBSD.org)
Received: from gitrepo.freebsd.org ([127.0.1.44])
by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 23EDlHwI066818;
Thu, 14 Apr 2022 13:47:17 GMT
(envelope-from git@gitrepo.freebsd.org)
Received: (from git@localhost)
by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23EDlHaB066817;
Thu, 14 Apr 2022 13:47:17 GMT
(envelope-from git)
Date: Thu, 14 Apr 2022 13:47:17 GMT
Message-Id: <202204141347.23EDlHaB066817@gitrepo.freebsd.org>
To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org,
dev-commits-src-main@FreeBSD.org
From: Cy Schubert <cy@FreeBSD.org>
Subject: git: 1e0ca65a3bb5 - main - wpa: Correctly call pcap_next_ex()
List-Id: Commit messages for the main branch of the src repository <dev-commits-src-main.freebsd.org>
List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main
List-Help: <mailto:dev-commits-src-main+help@freebsd.org>
List-Post: <mailto:dev-commits-src-main@freebsd.org>
List-Subscribe: <mailto:dev-commits-src-main+subscribe@freebsd.org>
List-Unsubscribe: <mailto:dev-commits-src-main+unsubscribe@freebsd.org>
Sender: owner-dev-commits-src-main@freebsd.org
X-BeenThere: dev-commits-src-main@freebsd.org
MIME-Version: 1.0
Content-Type: text/plain; charset=utf-8
Content-Transfer-Encoding: 8bit
X-Git-Committer: cy
X-Git-Repository: src
X-Git-Refname: refs/heads/main
X-Git-Reftype: branch
X-Git-Commit: 1e0ca65a3bb5798a80eccaae58d863f1f08b9ae8
Auto-Submitted: auto-generated
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org;
s=dkim; t=1649944037;
h=from:from:reply-to:subject:subject:date:date:message-id:message-id:
to:to:cc:mime-version:mime-version:content-type:content-type:
content-transfer-encoding:content-transfer-encoding;
bh=JXFZvaM5IiiFdBeKVdtlP0O1MZwgRVXLPSqCAFP4L+M=;
b=ePvz4kRD5186yZLipckvLeiNoHENLBD8mekXtEdKyEePuLoK6lUjYncgl45q5hRz6OVmPr
V3SZBameTgrix02QY+H0yUgGdFvIxAY87duz0pauGW8gdVKCORlGFP0lAT6xPUBHgVPebl
V1qUgmbN+VmpLIhLkNzZLYGTfznLQxjBCUQ/bB0pZIh5Rf5usq2W3+5QjZGt+IjRGmVYYt
KJ7V/55vNtSk/FvWaV+R4eArbFiztNPMJCPH3wkOkyPejScCHPfCWB09i2OeyLN9iskYmX
JMZGCn9y2mqzZ+Xt3inyAsIMJKcVfUZT2kK1HdbHJBypSlLLlWsE1JtHLbX7mg==
ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1649944037; a=rsa-sha256; cv=none;
b=ZtZ1rSTb0h3sSwUwhD9twDzMOYWwsGOhLbgkbC/J6X2/SAqPhW2fQZvzKd0yTIwW98DUFC
MNkIdUAu4HG3zNCZUIrzcJspERuGuzdZfJnPff3MUpUO1KPyGRrk/AjbJjYJ5d0DMka0C4
00Y4qEuZFLoIij1WHkw6qdXrWJEDMhVPUVC0Gwy2AKJVBWpZ4zuO8bCRhjihazNs+7X4k0
+mSDun5ZJE3tS3CtuKlAJJW0rZXl3fKjUdKteL3/MQ87Ye6LksJ5XDI9GCqupjtjNdY7S5
R4xV1OamYsSXUW4aOzfSEozJUxumYpZMDVeoJ7Uh18NIE62QRS9yZBEMrfQbEA==
ARC-Authentication-Results: i=1;
mx1.freebsd.org;
none
X-ThisMailContainsUnwantedMimeParts: N
The branch main has been updated by cy:
URL: https://cgit.FreeBSD.org/src/commit/?id=1e0ca65a3bb5798a80eccaae58d863f1f08b9ae8
commit 1e0ca65a3bb5798a80eccaae58d863f1f08b9ae8
Author: Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2022-04-14 01:45:49 +0000
Commit: Cy Schubert <cy@FreeBSD.org>
CommitDate: 2022-04-14 13:16:45 +0000
wpa: Correctly call pcap_next_ex()
The second argument to pcap_next_ex() is a pointer to a pointer.
Not a pointer. This fixes a wpa_supplicent SIGSEGV.
PR: 263266
Reported by: Marek Zarychta <zarychtam@plan-b.pwste.edu.pl>
Fixes: 6e5d01124fd4dd57899ddd9260c76dbb43543aa7
MFC: immediately
---
contrib/wpa/src/l2_packet/l2_packet_freebsd.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/contrib/wpa/src/l2_packet/l2_packet_freebsd.c b/contrib/wpa/src/l2_packet/l2_packet_freebsd.c
index da742f432120..0461758ff210 100644
--- a/contrib/wpa/src/l2_packet/l2_packet_freebsd.c
+++ b/contrib/wpa/src/l2_packet/l2_packet_freebsd.c
@@ -77,7 +77,7 @@ static void l2_packet_receive(int sock, void *eloop_ctx, void *sock_ctx)
{
struct l2_packet_data *l2 = eloop_ctx;
pcap_t *pcap = sock_ctx;
- struct pcap_pkthdr hdr;
+ struct pcap_pkthdr *hdr;
const u_char *packet;
struct l2_ethhdr *ethhdr;
unsigned char *buf;
@@ -88,16 +88,16 @@ static void l2_packet_receive(int sock, void *eloop_ctx, void *sock_ctx)
eloop_terminate();
}
- if (!l2->rx_callback || !packet || hdr.caplen < sizeof(*ethhdr))
+ if (!l2->rx_callback || !packet || hdr->caplen < sizeof(*ethhdr))
return;
ethhdr = (struct l2_ethhdr *) packet;
if (l2->l2_hdr) {
buf = (unsigned char *) ethhdr;
- len = hdr.caplen;
+ len = hdr->caplen;
} else {
buf = (unsigned char *) (ethhdr + 1);
- len = hdr.caplen - sizeof(*ethhdr);
+ len = hdr->caplen - sizeof(*ethhdr);
}
l2->rx_callback(l2->rx_callback_ctx, ethhdr->h_source, buf, len);
}