github-mirror/linux
1
0
Fork 0
mirror of https://github.com/torvalds/linux.git synced 2026-06-08 14:42:37 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity Graph

net: bluetooth: Remove the AID_NET_BT* gid numbers

Browse Source 
Removed bluetooth checks for AID_NET_BT and AID_NET_BT_ADMIN
which are not useful anymore.
This is in preparation for getting rid of all the AID_* gids.

Signed-off-by: JP Abgrall <jpa@google.com>
This commit is contained in:
JP Abgrall 2013-02-20 17:39:53 -08:00 committed by Arve Hjønnevåg
parent 2d54003046
commit 2b6cc26b6b
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
include/linux/android_aid.h
View File

@ -17,8 +17,8 @@
#define _LINUX_ANDROID_AID_H
/* AIDs that the kernel treats differently */
#define AID_NET_BT_ADMIN 3001
#define AID_NET_BT 3002
#define AID_OBSOLETE_000 3001 /* was NET_BT_ADMIN */
#define AID_OBSOLETE_001 3002 /* was NET_BT */
#define AID_INET 3003
#define AID_NET_RAW 3004
#define AID_NET_ADMIN 3005

10
net/bluetooth/af_bluetooth.c
View File

@ -30,10 +30,6 @@
#include <net/bluetooth/bluetooth.h>
#include <linux/proc_fs.h>
#ifdef CONFIG_ANDROID_PARANOID_NETWORK
#include <linux/android_aid.h>
#endif
#ifndef CONFIG_BT_SOCK_DEBUG
#undef BT_DBG
#define BT_DBG(D...)
@ -112,15 +108,15 @@ void bt_sock_unregister(int proto)
}
EXPORT_SYMBOL(bt_sock_unregister);
#ifdef CONFIG_ANDROID_PARANOID_NETWORK
#ifdef CONFIG_PARANOID_NETWORK
static inline int current_has_bt_admin(void)
{
return (!current_euid() || in_egroup_p(AID_NET_BT_ADMIN));
return !current_euid();
}
static inline int current_has_bt(void)
{
return (current_has_bt_admin() || in_egroup_p(AID_NET_BT));
return current_has_bt_admin();
}
# else
static inline int current_has_bt_admin(void)