Ubuntu
wpa package

Merge ~alkisg/ubuntu/+source/wpa:lp1867908 into ubuntu/+source/wpa:ubuntu/devel

  1. Git
  2. lp:~alkisg/ubuntu/+source/wpa
  3. lp1867908
  4. Merge into ubuntu/devel
Proposed by Alkis Georgopoulos
Status: Needs review
Proposed branch: ~alkisg/ubuntu/+source/wpa:lp1867908
Merge into: ubuntu/+source/wpa:ubuntu/devel
Diff against target: 74 lines (+52/-0)
3 files modified
debian/changelog (+6/-0)
debian/patches/lp1867908.patch (+45/-0)
debian/patches/series (+1/-0)
Reviewer Review Type Date Requested Status
Andrej Shadura (community) Disapprove
git-ubuntu developers Pending
Review via email: mp+381089@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Andrej Shadura (andrew.sh) wrote :

Rather than merging this please sync from Debian and drop the no longer necessary session-ticket.patch.

review: Disapprove
Reply
Revision history for this message
Andrej Shadura (andrew.sh) wrote :

(This patch has been merged into the Debian version of the package.)

Reply

Unmerged commits

97bb88c... by Alkis Georgopoulos

Fix RTM NEW/DELLINK IFLA_IFNAME copy for maximum ifname length (LP: #1867908)

a3d31cb... by Matthias Klose

Import patches-unapplied version 2:2.9-1ubuntu3 to ubuntu/focal-proposed

Imported using git-ubuntu import.

Changelog parent: 1e5d5f04ae0fedb7c1cffd4edce008b95ea56501

New changelog entries:
  * No-change rebuild for libgcc-s1 package name change.

1e5d5f0... by Leonidas S. Barbosa

Import patches-unapplied version 2:2.9-1ubuntu2 to ubuntu/eoan-proposed

Imported using git-ubuntu import.

Changelog parent: b9dd90740ba9719988a729a436e27ead2c15be14

New changelog entries:
   * SECURITY UPDATE: Incorrect indication of disconnection in certain
     situations
     - debian/patches/CVE-2019-16275.patch: silently ignore management
       frame from unexpected source address in src/ap/drv_callbacks.c,
       src/ap/ieee882_11.c.
     - CVE-2019-16275

b9dd907... by Julian Andres Klode

Import patches-unapplied version 2:2.9-1ubuntu1 to ubuntu/eoan-proposed

Imported using git-ubuntu import.

Changelog parent: 35883c9b676c260bd407d8a4cf0d18da29f4d9ad

New changelog entries:
  * Merge from Debian unstable. Remaining changes:
    - debian/patches/wpa_service_ignore-on-isolate.patch: add
      IgnoreOnIsolate=yes so that when switching "runlevels" in oem-config
      will not kill off wpa and cause wireless to be unavailable on first
      boot.
    - debian/patches/session-ticket.patch: disable the TLS Session Ticket
      extension to fix auth with 802.1x PEAP on some hardware.
  * Dropped CVE-2019-13377 patches, part of 2.9 release

35883c9... by Andrej Shadura

Import patches-unapplied version 2:2.9-1 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 0a9e9ca121fac493212d62168a5bd29be0a76fb2

New changelog entries:
  * New upstream release (Closes: #934180):
    - SECURITY UPDATE (CVE-2019-13377):
      Timing-based side-channel attack against WPA3's Dragonfly handshake
      when using Brainpool curves.
      More details:
      + https://w1.fi/security/2019-6/
      + https://wpa3.mathyvanhoef.com/
  * Drop a patch applied upstream.
  * Update debian/watch.

0a9e9ca... by Andrej Shadura

Import patches-unapplied version 2:2.8+git20190713+b8491ae-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: a5e223dd12bf1ff18e943da4ed12592443992217

New changelog entries:
  * Upload to experimental.
  * New upstream snapshot.
  * Drop patches applied upstream.

a5e223d... by Andrej Shadura

Import patches-unapplied version 2:2.8-3 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 17696d2eecdb3c216ed7af32562216bf1400dcdf

New changelog entries:
  * Upload to unstable.
  * Apply upstream patch:
    - Use a separate flag for 4-way handshake offload.
  * Spelling: meny -> menu.
  * Add lintian overrides for known issues.

17696d2... by Andrej Shadura

Import patches-unapplied version 2:2.8-2 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 4b642c1b4cec5cc00f790e768e9711745b7c7912

New changelog entries:
  * Delete patches applied upstream.
  * Apply upstream patch:
    - Fix a regression in storing of external_auth SSID/BSSID
  * Synchronise wpasupplicant configuration with the upstream.

4b642c1... by Andrej Shadura

Import patches-unapplied version 2:2.8-1 to debian/experimental

Imported using git-ubuntu import.

Changelog parent: 1ea5b2fb21118aeece234c092bdf23dbaab660cf

New changelog entries:
  * Upload to experimental.
  * New upstream release.
  * Update the watch file.
  * Drop debian/README-DPP, install shipped READMEs.
  * Refresh patches.

1ea5b2f... by Andrej Shadura

Import patches-unapplied version 2:2.7+git20190128+0c1e29f-5 to debian/sid

Imported using git-ubuntu import.

Changelog parent: 44454bd7f66197fecf97c4ab7ca720c0d001a722

New changelog entries:
  * Fix security issue 2019-5:
    - EAP-pwd message reassembly issue with unexpected fragment
      (Closes: #927463, no CVE assigned).

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/debian/changelog b/debian/changelog
2index 23f23cb..c617da2 100644
3--- a/debian/changelog
4+++ b/debian/changelog
5@@ -1,3 +1,9 @@
6+wpa (2:2.9-1ubuntu4) focal; urgency=medium
7+
8+ * Fix RTM NEW/DELLINK IFLA_IFNAME copy for maximum ifname length (LP: #1867908)
9+
10+ -- Alkis Georgopoulos <alkisg@gmail.com> Tue, 24 Mar 2020 05:34:58 +0200
11+
12 wpa (2:2.9-1ubuntu3) focal; urgency=medium
13
14 * No-change rebuild for libgcc-s1 package name change.
15diff --git a/debian/patches/lp1867908.patch b/debian/patches/lp1867908.patch
16new file mode 100644
17index 0000000..4321cba
18--- /dev/null
19+++ b/debian/patches/lp1867908.patch
20@@ -0,0 +1,45 @@
21+From 7546c489a95a033c78331915fcdfa0e6fd74d563 Mon Sep 17 00:00:00 2001
22+From: Ouden <Ouden.Biz@gmail.com>
23+Date: Wed, 18 Mar 2020 17:58:37 +0800
24+Subject: nl80211: Fix RTM NEW/DELLINK IFLA_IFNAME copy for maximum ifname
25+ length
26+
27+If the kernel rtm_newlink or rtm_dellink send the maximum length of
28+ifname (IFNAMSIZ), the event handlers in
29+wpa_driver_nl80211_event_rtm_addlink() and
30+wpa_driver_nl80211_event_rtm_dellink() did not copy the IFLA_IFNAME
31+value. Because the RTA_PAYLOAD (IFLA_IFNAME) length already includes the
32+NULL termination, that equals the IFNAMSIZ.
33+
34+Fix the condition when IFNAME reach maximum size.
35+
36+Signed-off-by: Ouden <Ouden.Biz@gmail.com>
37+---
38+ src/drivers/driver_nl80211.c | 4 ++--
39+ 1 file changed, 2 insertions(+), 2 deletions(-)
40+
41+diff --git a/src/drivers/driver_nl80211.c b/src/drivers/driver_nl80211.c
42+index efcd69a..c071cc0 100644
43+--- a/src/drivers/driver_nl80211.c
44++++ b/src/drivers/driver_nl80211.c
45+@@ -1047,7 +1047,7 @@ static void wpa_driver_nl80211_event_rtm_newlink(void *ctx,
46+ while (RTA_OK(attr, attrlen)) {
47+ switch (attr->rta_type) {
48+ case IFLA_IFNAME:
49+- if (RTA_PAYLOAD(attr) >= IFNAMSIZ)
50++ if (RTA_PAYLOAD(attr) > IFNAMSIZ)
51+ break;
52+ os_memcpy(ifname, RTA_DATA(attr), RTA_PAYLOAD(attr));
53+ ifname[RTA_PAYLOAD(attr)] = '\0';
54+@@ -1222,7 +1222,7 @@ static void wpa_driver_nl80211_event_rtm_dellink(void *ctx,
55+ while (RTA_OK(attr, attrlen)) {
56+ switch (attr->rta_type) {
57+ case IFLA_IFNAME:
58+- if (RTA_PAYLOAD(attr) >= IFNAMSIZ)
59++ if (RTA_PAYLOAD(attr) > IFNAMSIZ)
60+ break;
61+ os_memcpy(ifname, RTA_DATA(attr), RTA_PAYLOAD(attr));
62+ ifname[RTA_PAYLOAD(attr)] = '\0';
63+--
64+cgit v0.12
65+
66diff --git a/debian/patches/series b/debian/patches/series
67index d2d6379..41d0315 100644
68--- a/debian/patches/series
69+++ b/debian/patches/series
70@@ -10,3 +10,4 @@ allow-tlsv1.patch
71 session-ticket.patch
72 wpa_service_ignore-on-isolate.patch
73 CVE-2019-16275.patch
74+lp1867908.patch

Subscribers

People subscribed via source and target branches