Merge branch 'android-3.18' of https://android.googlesource.com/kernel/commontracking-linaro-android-llct-llct-20151019.0tracking-linaro-android-llct-llct-20151012.0tracking-linaro-android-llct-llct-20151006.0tracking-linaro-android-llct-llct-20151001.0

* android-3.18: (28 commits)
  lowmemorykiller: trace kill events.
  selinux: do not check open perm on ftruncate call
  Revert "HACK: usb: gadget: Fix enumeration on boot"
  ipv6: sysctl to restrict candidate source addresses
  ipv6: Remove unused arguments for __ipv6_dev_get_saddr().
  ipv6: Fix finding best source address in ipv6_dev_get_saddr().
  ipv6: Do not iterate over all interfaces when finding source address on specific interface.
  net: ipv6: allow explicitly choosing optimistic addresses
  net: ipv6: Add a sysctl to make optimistic addresses useful candidates
  Revert "net: ipv6: Add a sysctl to make optimistic addresses useful candidates"
  Revert "net: ipv6: allow choosing optimistic addresses with use_optimistic"
  net: ping: Return EAFNOSUPPORT when appropriate.
  net: core: fix UID-based routing build
  android: configs: base: enable IPV6
  Handle 'sk' being NULL in UID-based routing.
  UPSTREAM: ARM: 8425/1: kgdb: Don't try to stop the machine when setting breakpoints
  UPSTREAM: ARM: mm: allow text and rodata sections to be read-only
  BACKPORT: ARM: mm: allow non-text sections to be non-executable
  UPSTREAM: arm: kgdb: Handle read-only text / modules
  UPSTREAM: ARM: kexec: Make .text R/W in machine_kexec
  ...

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>

Conflicts:
	Documentation/device-mapper/verity.txt
	drivers/md/dm-verity.c
        ==> Pick changes from mainline commit 65ff5b7ddf05 "dm verity:
            add error handling modes for corrupted blocks" instead of
            changes from aosp commit e25690abc0b1 "dm-verity: Add modes
            and emit uevent on corrupted blocks".

	arch/arm/crypto/Makefile
	arch/arm/crypto/sha256_glue.c
	arch/arm/crypto/sha256_glue.h
	arch/arm/crypto/sha256_neon_glue.c
	crypto/Kconfig
        ==> Pick changes from mainline commit f2f770d74a8d "crypto:
            arm/sha256 - Add optimized SHA-256/224" instead of changes
            from aosp commit 06435950571f "crypto: arm/sha256 - Add
            optimized SHA-256/224"

	arch/arm/include/asm/cacheflush.h
        ==> Pick changes from mainline commit 80d6b0c2eed2 "ARM: mm:
            allow text and rodata sections to be read-only" instead
            of changes from  aosp commit 229aabdcbd25 "UPSTREAM: ARM:
            mm: allow text and rodata sections to be read-only".

	arch/arm/include/asm/fixmap.h
        ==> Pick changes from mainline commit a5f4c561b3b1 "ARM: 8415/1:
            early fixmap support for earlycon" over aosp changes.

	arch/arm/kernel/kgdb.c
        ==> Add changes from mainline commit fca08f326ae0 "ARM: probes:
            move all probe code to dedicate directory".

	arch/arm/kernel/patch.h
        ==> Pick mainline changes for patch.h i.e. delete it.

	arch/arm/kernel/vmlinux.lds.S
        ==> Pick changes from mainline commit commit 1e6b48116a95 "ARM:
            mm: allow non-text sections to be non-executable" instead of
            aosp commit 229aabdcbd25 "UPSTREAM: ARM: mm: allow text and
            rodata sections to be read-only".

	arch/arm/mm/Kconfig
        ==> Add changes from mainline commit fba289054f24 "ARM: 8298/1:
            ARM_KERNMEM_PERMS only works with MMU enabled".

	arch/arm/mm/init.c
        ==> Add changes from mainline commit 1e3479225acb "ARM: 8275/1:
            mm: fix PMD_SECT_RDONLY undeclared compile error".

	drivers/net/ppp/pppopns.c
	include/linux/if_pppox.h
        ==> Discard changes from aosp commit b17194022686 "net: PPPoPNS:
            Remove length argument from data_ready" since we no longer
            carry broken aosp pppopns and pppolac drivers. See commit
            4bacec07a089 "net: temporarily drop broken PPPoLAC and PPPoPNS drivers".

	drivers/staging/android/lowmemorykiller.c
        ==> Pick changes from mainline commits 49550b605587 "oom: add
            helpers for setting and clearing TIF_MEMDIE", e1099a69a624
            "android, lmk: avoid setting TIF_MEMDIE if process has already
            exited", and 16e951966f05 "mm: oom_kill: clean up victim marking
            and exiting interfaces" as well as changes from aosp commit
            fbc83982bfd5 "lowmemorykiller: trace kill events.".

	drivers/usb/gadget/udc/udc-core.c
        ==> Add changes from aosp commit e8205bb08bb7 "Revert "HACK:
            usb: gadget: Fix enumeration on boot"" and remove previous
            workarounds as well.

	include/linux/ipv6.h
	include/uapi/linux/ipv6.h
	net/ipv6/addrconf.c
        ==> Pick changes from mainline including 3985e8a3611a "ipv6:
            sysctl to restrict candidate source addresses" instead of
            aosp backport dbd204200c68 "ipv6: sysctl to restrict
            candidate source addresses".

	include/net/route.h
        ==> Add changes from aosp commit 83511cc43b56 "net: core: fix
            UID-based routing build" instead of equivalent linaro-android
            fix in llct.

6 files changed, 56 insertions, 14 deletions

diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index aba9ead1384c..9fadf6d7039b 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c
@@ -287,6 +287,7 @@ retry:
 			 * starvation.
 			 */
 			mm_flags &= ~FAULT_FLAG_ALLOW_RETRY;
+			mm_flags |= FAULT_FLAG_TRIED;
 			goto retry;
 		}
 	}
diff --git a/drivers/staging/android/lowmemorykiller.c b/drivers/staging/android/lowmemorykiller.c
index 5cca9d4b5c25..11541ac27c8d 100644
--- a/drivers/staging/android/lowmemorykiller.c
+++ b/drivers/staging/android/lowmemorykiller.c
@@ -41,6 +41,9 @@
 #include <linux/rcupdate.h>
 #include <linux/notifier.h>
 
+#define CREATE_TRACE_POINTS
+#include "trace/lowmemorykiller.h"
+
 static uint32_t lowmem_debug_level = 1;
 static short lowmem_adj[6] = {
 	0,
@@ -169,6 +172,10 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc)
 		 */
 		mark_oom_victim(selected);
 		task_unlock(selected);
+		long cache_size = other_file * (long)(PAGE_SIZE / 1024);
+		long cache_limit = minfree * (long)(PAGE_SIZE / 1024);
+		long free = other_free * (long)(PAGE_SIZE / 1024);
+		trace_lowmemory_kill(selected, cache_size, cache_limit, free);
 		lowmem_print(1, "Killing '%s' (%d), adj %hd,\n" \
 				"   to free %ldkB on behalf of '%s' (%d) because\n" \
 				"   cache %ldkB is below limit %ldkB for oom_score_adj %hd\n" \
@@ -177,10 +184,9 @@ static unsigned long lowmem_scan(struct shrinker *s, struct shrink_control *sc)
 			     selected_oom_score_adj,
 			     selected_tasksize * (long)(PAGE_SIZE / 1024),
 			     current->comm, current->pid,
-			     other_file * (long)(PAGE_SIZE / 1024),
-			     minfree * (long)(PAGE_SIZE / 1024),
+			     cache_size, cache_limit,
 			     min_score_adj,
-			     other_free * (long)(PAGE_SIZE / 1024));
+			     free);
 		lowmem_deathpending_timeout = jiffies + HZ;
 		send_sig(SIGKILL, selected, 0);
 		rem += selected_tasksize;
diff --git a/drivers/staging/android/trace/lowmemorykiller.h b/drivers/staging/android/trace/lowmemorykiller.h
new file mode 100644
index 000000000000..f43d3fae75ee
--- /dev/null
+++ b/drivers/staging/android/trace/lowmemorykiller.h
@@ -0,0 +1,41 @@
+#undef TRACE_SYSTEM
+#define TRACE_INCLUDE_PATH ../../drivers/staging/android/trace
+#define TRACE_SYSTEM lowmemorykiller
+
+#if !defined(_TRACE_LOWMEMORYKILLER_H) || defined(TRACE_HEADER_MULTI_READ)
+#define _TRACE_LOWMEMORYKILLER_H
+
+#include <linux/tracepoint.h>
+
+TRACE_EVENT(lowmemory_kill,
+	TP_PROTO(struct task_struct *killed_task, long cache_size, \
+		 long cache_limit, long free),
+
+	TP_ARGS(killed_task, cache_size, cache_limit, free),
+
+	TP_STRUCT__entry(
+			__array(char, comm, TASK_COMM_LEN)
+			__field(pid_t, pid)
+			__field(long, pagecache_size)
+			__field(long, pagecache_limit)
+			__field(long, free)
+	),
+
+	TP_fast_assign(
+			memcpy(__entry->comm, killed_task->comm, TASK_COMM_LEN);
+			__entry->pid = killed_task->pid;
+			__entry->pagecache_size = cache_size;
+			__entry->pagecache_limit = cache_limit;
+			__entry->free = free;
+	),
+
+	TP_printk("%s (%d), page cache %ldkB (limit %ldkB), free %ldKb",
+		__entry->comm, __entry->pid, __entry->pagecache_size,
+		__entry->pagecache_limit, __entry->free)
+);
+
+
+#endif /* if !defined(_TRACE_LOWMEMORYKILLER_H) || defined(TRACE_HEADER_MULTI_READ) */
+
+/* This part must be outside protection */
+#include <trace/define_trace.h>
diff --git a/drivers/usb/gadget/udc/udc-core.c b/drivers/usb/gadget/udc/udc-core.c
index 1bc5dad5dc67..2be331fdda22 100644
--- a/drivers/usb/gadget/udc/udc-core.c
+++ b/drivers/usb/gadget/udc/udc-core.c
@@ -243,15 +243,7 @@ EXPORT_SYMBOL_GPL(usb_gadget_set_state);
 static void usb_udc_connect_control(struct usb_udc *udc)
 {
 	if (udc->vbus) {
-		/*
-		 * HACK: The Android gadget driver disconnects the gadget
-		 * on bind and expects the gadget to stay disconnected until
-		 * it calls usb_gadget_connect when userspace is ready. Remove
-		 * the call to usb_gadget_connect bellow to avoid enabling the
-		 * pullup before userspace is ready.
-		 *
-		 * usb_gadget_connect(udc->gadget);
-		 */
+		usb_gadget_connect(udc->gadget);
 	} else
 		usb_gadget_disconnect(udc->gadget);
 }
diff --git a/include/net/route.h b/include/net/route.h
index c42b88c695b1..1f16f4e15066 100644
--- a/include/net/route.h
+++ b/include/net/route.h
@@ -142,7 +142,8 @@ static inline struct rtable *ip_route_output_ports(struct net *net, struct flowi
 	flowi4_init_output(fl4, oif, sk ? sk->sk_mark : 0, tos,
 			   RT_SCOPE_UNIVERSE, proto,
 			   sk ? inet_sk_flowi_flags(sk) : 0,
-			   daddr, saddr, dport, sport, sk ? sock_i_uid(sk) : GLOBAL_ROOT_UID);
+			   daddr, saddr, dport, sport,
+			   sk ? sock_i_uid(sk) : GLOBAL_ROOT_UID);
 	if (sk)
 		security_sk_classify_flow(sk, flowi4_to_flowi(fl4));
 	return ip_route_output_flow(net, fl4, sk);
diff --git a/security/selinux/hooks.c b/security/selinux/hooks.c
index e4369d86e588..7cd71cea0503 100644
--- a/security/selinux/hooks.c
+++ b/security/selinux/hooks.c
@@ -2946,7 +2946,8 @@ static int selinux_inode_setattr(struct dentry *dentry, struct iattr *iattr)
 			ATTR_ATIME_SET | ATTR_MTIME_SET | ATTR_TIMES_SET))
 		return dentry_has_perm(cred, dentry, FILE__SETATTR);
 
-	if (selinux_policycap_openperm && (ia_valid & ATTR_SIZE))
+	if (selinux_policycap_openperm && (ia_valid & ATTR_SIZE)
+			&& !(ia_valid & ATTR_FILE))
 		av |= FILE__OPEN;
 
 	return dentry_has_perm(cred, dentry, av);