pa-fazil
/
android_bionic
mirror of https://github.com/fazilsheik96/android_bionic.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "Soft-enable MAC address restrictions with allowlist." 

Revert "Updates CTS tests for MAC address restrictions."

Revert submission 1518603-soft-restrict-mac

Reason for revert: Missing type check
Reverted Changes:
I0488932de:Soft-enable MAC address restrictions with allowlis...
Idb9d940e4:Updates CTS tests for MAC address restrictions.
I9461f287e:Return anonymized MAC for apps targeting SDK < 30

Change-Id: I7e8e593518088ff5c8f6083b34e6966852475b9b
This commit is contained in:
Bram Bonné 2020-12-14 14:14:23 +01:00
parent 7dcea5e8e2
commit 9e97280414
6 changed files with 4 additions and 206 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/Android.bp
View File

@ -1009,9 +1009,7 @@ cc_library_static {
"bionic/arpa_inet.cpp",
"bionic/assert.cpp",
"bionic/atof.cpp",
"bionic/bind.cpp",
"bionic/bionic_allocator.cpp",
"bionic/bionic_appcompat.cpp",
"bionic/bionic_arc4random.cpp",
"bionic/bionic_futex.cpp",
"bionic/bionic_netlink.cpp",

4
libc/SYSCALLS.TXT
View File

@ -244,7 +244,7 @@ int __signalfd4:signalfd4(int, const sigset64_t*, size_t, int) all
# sockets
int __socket:socket(int, int, int) arm,lp64
int __socketpair:socketpair(int, int, int, int*) arm,lp64
int __bind:bind(int, struct sockaddr*, socklen_t) arm,lp64
int bind(int, struct sockaddr*, socklen_t) arm,lp64
int __connect:connect(int, struct sockaddr*, socklen_t) arm,lp64
int listen(int, int) arm,lp64
int __accept4:accept4(int, struct sockaddr*, socklen_t*, int) arm,lp64
@ -262,7 +262,7 @@ int __sendmmsg:sendmmsg(int, struct mmsghdr*, unsigned int, int) arm
# sockets for x86. These are done as an "indexed" call to socketcall syscall.
int __socket:socketcall:1(int, int, int) x86
int __bind:socketcall:2(int, struct sockaddr*, int) x86
int bind:socketcall:2(int, struct sockaddr*, int) x86
int __connect:socketcall:3(int, struct sockaddr*, socklen_t) x86
int listen:socketcall:4(int, int) x86
int getsockname:socketcall:6(int, struct sockaddr*, socklen_t*) x86

63
libc/bionic/bind.cpp
View File

@ -1,63 +0,0 @@
/*
* Copyright (C) 2020 The Android Open Source Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
// b/170214442: Intercept bind calls on NETLINK_ROUTE sockets.
// This entire file will be reverted before release.
#include <async_safe/log.h>
#include <errno.h>
#include <linux/rtnetlink.h>
#include <string.h>
#include <sys/socket.h>
#include "bionic_appcompat.h"
extern "C" int __bind(int fd, const struct sockaddr* addr, socklen_t addr_length);
int bind(int fd, const struct sockaddr* addr, socklen_t addr_length) {
if (should_apply_soft_mac_bind_restrictions()) {
int sock_protocol;
socklen_t sock_length = sizeof(sock_protocol);
if (getsockopt(fd, SOL_SOCKET, SO_PROTOCOL, &sock_protocol, &sock_length) < 0) {
async_safe_format_log(ANDROID_LOG_ERROR, "mac-restrictions",
"Could not get socket protocol: %s", strerror(errno));
} else if (NETLINK_ROUTE == sock_protocol) {
char package_name[MAX_PACKAGE_NAME_LENGTH + 1];
get_package_name(package_name, sizeof(package_name));
async_safe_format_log(
ANDROID_LOG_ERROR, "mac-restrictions",
"%s tried to call bind() on a NETLINK_ROUTE socket, which is not allowed. Please follow "
"instructions at go/netlink-bug if this app behaves incorrectly.",
package_name);
errno = EACCES;
return -1;
}
}
return __bind(fd, addr, addr_length);
}

89
libc/bionic/bionic_appcompat.cpp
View File

@ -1,89 +0,0 @@
/*
* Copyright (C) 2020 The Android Open Source Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
// b/170214442: Intercept bind calls on NETLINK_ROUTE sockets and getifaddrs() calls.
// This entire file will be reverted before release.
#include <async_safe/log.h>
#include <cutils/misc.h>
#include <fcntl.h>
#include <string.h>
#include <unistd.h>
#include "bionic_appcompat.h"
bool should_apply_soft_mac_restrictions(const char* const allowlist[]) {
if (getuid() < FIRST_APPLICATION_UID) {
// System app. No restrictions should be applied.
return false;
}
if (android_get_application_target_sdk_version() >= __ANDROID_API_R__) {
// Restrictions already applied by SELinux. Behave as normally.
return false;
}
char package_name[MAX_PACKAGE_NAME_LENGTH + 1];
if (get_package_name(package_name, sizeof(package_name)) < 0) {
// Error in getting own package name. Apply restrictions by default.
async_safe_format_log(ANDROID_LOG_ERROR, "mac-restrictions",
"Could not determine own package name for uid %d", getuid());
return true;
}
for (int i = 0; allowlist[i] != nullptr; i++) {
if (strcmp(package_name, allowlist[i]) == 0) {
async_safe_format_log(ANDROID_LOG_WARN, "mac-restrictions",
"Temporarily allowing %s to bypass MAC address restrictions.",
package_name);
return false;
}
}
return true;
}
bool should_apply_soft_mac_bind_restrictions() {
return should_apply_soft_mac_restrictions(soft_mac_bind_allowlist);
}
bool should_apply_soft_mac_getlink_restrictions() {
return should_apply_soft_mac_restrictions(soft_mac_getlink_allowlist);
}
int get_package_name(char* buffer, const int bufferlen) {
int file = open("/proc/self/cmdline", O_RDONLY | O_CLOEXEC);
if (file < 0) {
return file;
}
int len = read(file, buffer, bufferlen - 1);
if (len < 0) {
return -1;
}
buffer[len] = 0;
return 0;
}

44
libc/bionic/bionic_appcompat.h
View File

@ -1,44 +0,0 @@
/*
* Copyright (C) 2020 The Android Open Source Project
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
* * Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
* * Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
* "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
* LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
* FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
* COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
* BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS
* OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED
* AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*/
#pragma once
constexpr int MAX_PACKAGE_NAME_LENGTH = 230;
static inline const char* const soft_mac_bind_allowlist[] = {
"com.skype.raider",
nullptr,
};
static inline const char* const soft_mac_getlink_allowlist[] = {
nullptr,
};
int get_package_name(char* buffer, const int bufferlen);
bool should_apply_soft_mac_bind_restrictions();
bool should_apply_soft_mac_getlink_restrictions();

8
libc/bionic/ifaddrs.cpp
View File

@ -42,7 +42,6 @@
#include "private/ErrnoRestorer.h"
#include "bionic_appcompat.h"
#include "bionic_netlink.h"
// The public ifaddrs struct is full of pointers. Rather than track several
@ -311,12 +310,9 @@ int getifaddrs(ifaddrs** out) {
// - System apps
// - Apps with a target SDK version lower than R
bool getlink_success = false;
if (!should_apply_soft_mac_getlink_restrictions()) {
if (getuid() < FIRST_APPLICATION_UID ||
android_get_application_target_sdk_version() < __ANDROID_API_R__) {
getlink_success = nc.SendRequest(RTM_GETLINK) && nc.ReadResponses(__getifaddrs_callback, out);
} else if (android_get_application_target_sdk_version() < __ANDROID_API_R__) {
async_safe_format_log(ANDROID_LOG_WARN, "mac-restrictions",
"ifaddr no longer returns link info. Please follow instructions at "
"go/netlink-bug if this app behaves incorrectly.");
}
bool getaddr_success =
nc.SendRequest(RTM_GETADDR) && nc.ReadResponses(__getifaddrs_callback, out);