aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to 'net/bluetooth/af_bluetooth.c')
-rw-r--r--net/bluetooth/af_bluetooth.c10
1 files changed, 3 insertions, 7 deletions
diff --git a/net/bluetooth/af_bluetooth.c b/net/bluetooth/af_bluetooth.c
index ca21d11fe15..49a70855727 100644
--- a/net/bluetooth/af_bluetooth.c
+++ b/net/bluetooth/af_bluetooth.c
@@ -30,10 +30,6 @@
30#include <net/bluetooth/bluetooth.h> 30#include <net/bluetooth/bluetooth.h>
31#include <linux/proc_fs.h> 31#include <linux/proc_fs.h>
32 32
33#ifdef CONFIG_ANDROID_PARANOID_NETWORK
34#include <linux/android_aid.h>
35#endif
36
37#ifndef CONFIG_BT_SOCK_DEBUG 33#ifndef CONFIG_BT_SOCK_DEBUG
38#undef BT_DBG 34#undef BT_DBG
39#define BT_DBG(D...) 35#define BT_DBG(D...)
@@ -121,15 +117,15 @@ int bt_sock_unregister(int proto)
121} 117}
122EXPORT_SYMBOL(bt_sock_unregister); 118EXPORT_SYMBOL(bt_sock_unregister);
123 119
124#ifdef CONFIG_ANDROID_PARANOID_NETWORK 120#ifdef CONFIG_PARANOID_NETWORK
125static inline int current_has_bt_admin(void) 121static inline int current_has_bt_admin(void)
126{ 122{
127 return (!current_euid() || in_egroup_p(AID_NET_BT_ADMIN)); 123 return !current_euid();
128} 124}
129 125
130static inline int current_has_bt(void) 126static inline int current_has_bt(void)
131{ 127{
132 return (current_has_bt_admin() || in_egroup_p(AID_NET_BT)); 128 return current_has_bt_admin();
133} 129}
134# else 130# else
135static inline int current_has_bt_admin(void) 131static inline int current_has_bt_admin(void)