/[gentoo-x86]/net-misc/networkmanager/files/networkmanager-0.9.8.9-fix-crash-on-wifi-rescan.patch
Gentoo

Contents of /net-misc/networkmanager/files/networkmanager-0.9.8.9-fix-crash-on-wifi-rescan.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 1.1 - (show annotations) (download) (as text)
Mon Jun 16 00:16:36 2014 UTC (4 years, 10 months ago) by reavertm
Branch: MAIN
CVS Tags: HEAD
File MIME type: text/x-diff
Apply upstream patch for crash on Wifi re-scan.

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B1E955DB)

1 From 4099c9242b091604466dda081dc5f6909354258b Mon Sep 17 00:00:00 2001
2 From: M. Vefa Bicakci <m.v.b@runbox.com>
3 Date: Sat, 24 May 2014 23:37:00 +0000
4 Subject: core: fix crash during Wi-Fi rescan by emitting NM_DEVICE_AUTH_REQUEST signal correctly
5
6 Fixes regression introduced by commit da59b6d2229b85afbb9e14846931376340dc6030.
7
8 https://mail.gnome.org/archives/networkmanager-list/2014-May/msg00038.html
9
10 Backport-of: d9653484859c426f707b4759bc9882f7a57c1152
11 [thaller@redhat.com: original patch modified in nm-device-wifi.c to pass no
12 connection, as it is done on master]
13 Signed-off-by: Thomas Haller <thaller@redhat.com>
14 ---
15 diff --git a/src/nm-device-wifi.c b/src/nm-device-wifi.c
16 index 8ca5278..052d68f 100644
17 --- a/src/nm-device-wifi.c
18 +++ b/src/nm-device-wifi.c
19 @@ -1563,6 +1563,7 @@ impl_device_request_scan (NMDeviceWifi *self,
20 g_signal_emit_by_name (device,
21 NM_DEVICE_AUTH_REQUEST,
22 context,
23 + NULL,
24 NM_AUTH_PERMISSION_NETWORK_CONTROL,
25 TRUE,
26 request_scan_cb,
27 diff --git a/src/nm-manager.c b/src/nm-manager.c
28 index 9037e64..96bf3b4 100644
29 --- a/src/nm-manager.c
30 +++ b/src/nm-manager.c
31 @@ -1874,10 +1874,10 @@ device_auth_request_cb (NMDevice *device,
32 }
33
34 /* Ensure the subject has permissions for this connection */
35 - if (!nm_auth_uid_in_acl (connection,
36 - priv->session_monitor,
37 - sender_uid,
38 - &error_desc)) {
39 + if (connection != NULL && !nm_auth_uid_in_acl (connection,
40 + priv->session_monitor,
41 + sender_uid,
42 + &error_desc)) {
43 error = g_error_new_literal (NM_MANAGER_ERROR,
44 NM_MANAGER_ERROR_PERMISSION_DENIED,
45 error_desc);
46 --
47 cgit v0.9.0.2-2-gbebe

  ViewVC Help
Powered by ViewVC 1.1.20