diff options
| author | Milan P. Stanić <mps@arvanta.net> | 2019-12-02 18:53:46 +0100 |
|---|---|---|
| committer | Milan P. Stanić <mps@arvanta.net> | 2019-12-02 18:55:36 +0100 |
| commit | 525a73bdc195f711b37b83d204617e4d3f0a4fdc (patch) | |
| tree | 59ea68d78b443adcd0deddcb43f92596e45298ba /community/iwd | |
| parent | 7178f8f1c3fb2ca72b40abe443a0f426d57da3b6 (diff) | |
| download | aports-525a73bdc195f711b37b83d204617e4d3f0a4fdc.tar.bz2 aports-525a73bdc195f711b37b83d204617e4d3f0a4fdc.tar.xz | |
community/iwd: fix crash when scan is triggered outside iwd
add upstream patch
fixes: #11004
Diffstat (limited to 'community/iwd')
| -rw-r--r-- | community/iwd/APKBUILD | 4 | ||||
| -rw-r--r-- | community/iwd/fix-scan.patch | 33 |
2 files changed, 36 insertions, 1 deletions
diff --git a/community/iwd/APKBUILD b/community/iwd/APKBUILD index 1745349b64..54149e2856 100644 --- a/community/iwd/APKBUILD +++ b/community/iwd/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: Milan P. Stanić <mps@arvanta.net> pkgname=iwd pkgver=1.2 -pkgrel=0 +pkgrel=1 pkgdesc="Internet Wireless Daemon" url="https://iwd.wiki.kernel.org/" arch="all" @@ -15,6 +15,7 @@ source="https://mirrors.edge.kernel.org/pub/linux/network/wireless/iwd-$pkgver.t dbus-netdev-group.patch disable-eapol-test.patch fix-rawmemchr.patch + fix-scan.patch iwd.initd main.conf " @@ -51,5 +52,6 @@ sha512sums="2ff3c03dc0abc031d4149eb48736ddf1cf85681ba3b8e47d3bbfa89ff4772887b682 7d3bc26b558ebfd22335b946f09abd5326e885275979c617af7def1468ade23ba7605f3b13aaf91836035c130aaec04be0ff2708a898f3ae835e0eef4e78fa0e dbus-netdev-group.patch b3dfb5a2de110a8d6218fc6ec7f8e7690bc2ad130037051867d105aff23031d2340f55ac99f060d97856cb5818df24eb7631dc82dcbc196aa44251b2e5edcf7b disable-eapol-test.patch 2d8cc70a9475465755f8187c6afb93e5792842dccf55f977ce111e98477517feae1be81eefd50c53149c61d7944a728dc504938ad678a2c789703bcc6f1e7507 fix-rawmemchr.patch +f3a101605e2823eda0ee41945cecd15d1c2b2cf44315e336e079db283f6f8ed4b76c7192cab7ad6f1ade9c361dd54c6866b2f3c3cec7e26ea89b5c0a29f7365c fix-scan.patch 1a913fa19a76a18d92b8f44cb5b4b99a64b4e2f7d2b4a486bf1ba2f939aea7dcca772fca91483011ada58aaa3addc29c76ececd708b2187e57f72aa040ac77e6 iwd.initd cc875faa69d5a0a673f923b6373a0d25e15166eef11b91d2ed75e99099e2087ba3d7930243b53cb6c53fc25bfe5f536268da7d40c7b286170388e813ce73d949 main.conf" diff --git a/community/iwd/fix-scan.patch b/community/iwd/fix-scan.patch new file mode 100644 index 0000000000..42fdf1db79 --- /dev/null +++ b/community/iwd/fix-scan.patch @@ -0,0 +1,33 @@ +From d2556a48b7d65eb670fb0ce20e3f929bf9839a20 Mon Sep 17 00:00:00 2001 +From: Denis Kenzior <denkenz@gmail.com> +Date: Mon, 2 Dec 2019 10:53:55 -0600 +Subject: scan: Fix crash when scan is triggered outside iwd + + #0 0x000055555558ee5d in scan_notify (msg=0x55555560b640, user_data=0x0) at src/scan.c:1706 + #1 0x00007ffff7f2c78c in ?? () from /usr/lib/libell.so.0 + #2 0x00007ffff7f299ec in ?? () from /usr/lib/libell.so.0 + #3 0x00007ffff7f28e4a in l_main_iterate () from /usr/lib/libell.so.0 + #4 0x00007ffff7f28efc in l_main_run () from /usr/lib/libell.so.0 + #5 0x00007ffff7f290b9 in l_main_run_with_signal () from /usr/lib/libell.so.0 + #6 0x00005555555639c4 in main (argc=1, argv=0x7fffffffec18) at src/main.c:497 +--- + src/scan.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/src/scan.c b/src/scan.c +index e8133ff0..97b37c68 100644 +--- a/src/scan.c ++++ b/src/scan.c +@@ -1703,7 +1703,8 @@ static void scan_notify(struct l_genl_msg *msg, void *user_data) + else + sc->state = SCAN_STATE_PASSIVE; + +- sr->start_time_tsf = start_time_tsf; ++ if (sr) ++ sr->start_time_tsf = start_time_tsf; + + break; + +-- +cgit 1.2-0.3.lf.el7 + |