Commit Graph

564494 Commits

Author SHA1 Message Date
Amit Pundir
aaed164e81 android: recommended.cfg: remove CONFIG_UID_STAT
Remove UID Stat driver.

Change-Id: Ifc9d2c6fe27900f30e6407398f5b24222518bffc
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2016-05-19 12:32:41 +05:30
Amit Pundir
6fb5902fa9 netfilter: xt_qtaguid: seq_printf fixes
Update seq_printf() usage in xt_qtaguid to align
with changes from mainline commit 6798a8caaf
"fs/seq_file: convert int seq_vprint/seq_printf/etc...
returns to void".

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2016-05-19 12:32:41 +05:30
Amit Pundir
58025a0a1b Revert "misc: uidstat: Adding uid stat driver to collect network statistics."
This reverts commit 6b6d5fbf9a.

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2016-05-19 12:32:41 +05:30
Amit Pundir
358ebabf99 Revert "net: activity_stats: Add statistics for network transmission activity"
This reverts commit afedd7beba.

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2016-05-19 12:32:41 +05:30
Amit Pundir
87b4d82801 Revert "net: activity_stats: Stop using obsolete create_proc_read_entry api"
This reverts commit 7c121720fa.

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2016-05-19 12:32:41 +05:30
Amit Pundir
e9edcb0046 Revert "misc: uidstat: avoid create_stat() race and blockage."
This reverts commit f7a8121740.

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2016-05-19 12:32:41 +05:30
Amit Pundir
d9e6431c6c Revert "misc: uidstat: Remove use of obsolete create_proc_read_entry api"
This reverts commit fccab646d3.

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2016-05-19 12:32:41 +05:30
Amit Pundir
5cbf5fb147 Revert "misc seq_printf fixes for 4.4"
This reverts commit 5c7566a29b.

This patch revert some changes in net/netfilter/xt_qtaguid.c as well.
I'll submit another patch to restore those changes.

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2016-05-19 12:32:41 +05:30
Amit Pundir
985a340136 Revert "misc: uid_stat: Include linux/atomic.h instead of asm/atomic.h"
This reverts commit 8d3a6c1538.

This series of patches revert AOSP UID_STAT and NET_ACTIVITY_STATS drivers.
I could not find any meaningful usage of these interfaces in AOSP master.

UID_STAT driver expose "/proc/uid_stat/*" interfaces but it is only
used in AOSP master as in what appears be an out of date bandwidth
test in frameworks/base and in somewhat recent battery utils test
in external/chromium-trace project.

NET_ACTIVITY_STATS driver expose "/proc/net/stat/activity" interface
but I can not track its usage anywhere in AOSP at all.

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2016-05-19 12:32:41 +05:30
Dmitry Shmidt
3094efd84c Revert "net: socket ioctl to reset connections matching local address"
Use SOCK_DESTROY from now instead of SIOCKILLADDR

This reverts commit 38f0ec724f.

Change-Id: I2dcd833b66c88a48de8978dce9d72ab78f9af549
2016-05-19 12:32:41 +05:30
Dmitry Shmidt
d8c5b6f850 Revert "net: fix iterating over hashtable in tcp_nuke_addr()"
This reverts commit 4747299b2c.
2016-05-19 12:32:41 +05:30
Dmitry Shmidt
cf84d75f72 Revert "net: fix crash in tcp_nuke_addr()"
This reverts commit 08f7c4280c.
2016-05-19 12:32:41 +05:30
Dmitry Shmidt
99bbdddee0 Revert "Don't kill IPv4 sockets when killing IPv6 sockets was requested."
This reverts commit 8bf4413b4f.
2016-05-19 12:32:41 +05:30
Dmitry Shmidt
7f3c0b7b8a Revert "tcp: Fix IPV6 module build errors"
This reverts commit 3823c8136f.
2016-05-19 12:32:41 +05:30
Dmitry Shmidt
e193d9de7c android: base-cfg: remove CONFIG_SWITCH
Change-Id: I3fd1aa7a54fe3a8d3ad5537cbc61386e52f41ea0
Signed-off-by: Dmitry Shmidt <dimitrysh@google.com>
2016-05-19 12:32:41 +05:30
Dmitry Shmidt
c631c9800f Revert "switch: switch class and GPIO drivers."
Drivers should use extcon moving forward.
Documentation/extcon/porting-android-switch-class describes
how to port existing switch class drivers to extcon.

This reverts commit e4b8e66e0a.

Change-Id: I5b622c7ab4c0cb9670f8903f259a99888f503c1a
2016-05-19 12:32:41 +05:30
Dmitry Shmidt
d18fffdddb Revert "drivers: switch: remove S_IWUSR from dev_attr"
This reverts commit dc66dee02d.
2016-05-19 12:32:41 +05:30
Amit Pundir
56fc8bbed1 ANDROID: base-cfg: enable CONFIG_IP_NF_NAT
IP_NF_TARGET_{MASQUERADE,NETMAP,REDIRECT} configs,
already enabled in android-base.cfg for tethering,
are of no use if CONFIG_IP_NF_NAT is not enabled.

Don't rely on platform config for that and enable
CONFIG_IP_NF_NAT in android-base.cfg as well.

Change-Id: Ic72bcebbd925b142b09539466bf963188c83108a
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>
2016-05-19 12:32:41 +05:30
Jeff Vander Stoep
c2e10e5cb2 BACKPORT: selinux: restrict kernel module loading
Backport notes:
Backport uses kernel_module_from_file not kernel_read_file hook.
kernel_read_file replaced kernel_module_from_file in the 4.6 kernel.
There are no inode_security_() helper functions (also introduced in
4.6) so the inode lookup is done using the file_inode() helper which
is standard for kernel version < 4.6.

(Cherry picked from commit 61d612ea731e57dc510472fb746b55cdc017f371)

Utilize existing kernel_read_file hook on kernel module load.
Add module_load permission to the system class.

Enforces restrictions on kernel module origin when calling the
finit_module syscall. The hook checks that source type has
permission module_load for the target type.
Example for finit_module:

allow foo bar_file:system module_load;

Similarly restrictions are enforced on kernel module loading when
calling the init_module syscall. The hook checks that source
type has permission module_load with itself as the target object
because the kernel module is sourced from the calling process.
Example for init_module:

allow foo foo:system module_load;

Bug: 27824855
Change-Id: I64bf3bd1ab2dc735321160642dc6bbfa996f8068
Signed-off-by: Jeff Vander Stoep <jeffv@google.com>
Signed-off-by: Paul Moore <paul@paul-moore.com>
2016-05-19 12:32:41 +05:30
Rom Lemarchand
b8a5593858 android: base-cfg: enable CONFIG_QUOTA
Bug: 28032718
Change-Id: I7cb6b641f72085e69b90dca11d2ea68adcd02390
(cherry picked from commit e1b53a388e9cfcf870520a6899a37456cf1ae2c6)
2016-05-19 12:32:41 +05:30
Alex Shi
b3f09bff3f Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android 2016-05-12 12:20:40 +08:00
Alex Shi
e37ddf2710 Merge tag 'v4.4.10' into linux-linaro-lsk-v4.4
This is the 4.4.10 stable release
2016-05-12 12:20:36 +08:00
Alex Shi
334ca3ed18 Merge branch 'linux-linaro-lsk-v4.4' into linux-linaro-lsk-v4.4-android 2016-05-12 09:27:18 +08:00
Alex Shi
9ba733e262 Merge branch 'v4.4/topic/mm-kaslr' into linux-linaro-lsk-v4.4 2016-05-12 09:25:41 +08:00
Helge Deller
5dd612ebfa parisc: Use generic extable search and sort routines
Switch to the generic extable search and sort routines which were introduced
with commit a272858 from Ard Biesheuvel. This saves quite some memory in the
vmlinux binary with the 64bit kernel.

Signed-off-by: Helge Deller <deller@gmx.de>
(cherry picked from commit 0de798584bdedfdad19db21e3c7aec84f252f4f3)
Signed-off-by: Alex Shi <alex.shi@linaro.org>
2016-05-12 09:05:25 +08:00