diff --git a/arch/arm64/configs/aosp_loire_suzu_defconfig b/arch/arm64/configs/aosp_loire_suzu_defconfig
index 64db9d9d021f2..a0f9b7f036fbf 100644
--- a/arch/arm64/configs/aosp_loire_suzu_defconfig
+++ b/arch/arm64/configs/aosp_loire_suzu_defconfig
@@ -708,3 +708,22 @@ CONFIG_LOGCAT_SIZE=256
 
 # ENABLE MEMNOTIFY DRIVER
 CONFIG_MEMNOTIFY=y
+CONFIG_SQUASHFS=y
+CONFIG_SQUASHFS_XZ=y
+CONFIG_OVERLAYFS_FS=y
+
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+CONFIG_MEMCG=y
+CONFIG_MEMCG_SWAP=y
+CONFIG_MEMCG_KMEM=y
+CONFIG_DEVPTS_MULTIPLE_INSTANCES=y
+CONFIG_VETH=y
+CONFIG_MACVLAN=y
+CONFIG_VLAN_8021Q=y
+CONFIG_BRIDGE=y
+CONFIG_NF_NAT_IPV6=y
+CONFIG_IP6_NF_TARGET_MASQUERADE=y
+CONFIG_NETFILTER_XT_TARGET_CHECKSUM=y
diff --git a/mm/memcontrol.c b/mm/memcontrol.c
index 23c9c68fd232f..c9d6121023cf7 100644
--- a/mm/memcontrol.c
+++ b/mm/memcontrol.c
@@ -6997,7 +6997,7 @@ static int mem_cgroup_allow_attach(struct cgroup *cgrp,
 		tcred = __task_cred(task);
 
 		if ((current != task) && !capable(CAP_SYS_ADMIN) &&
-		    cred->euid != tcred->uid && cred->euid != tcred->suid)
+		    !uid_eq(cred->euid, tcred->uid) && !uid_eq(cred->euid, tcred->suid))
 			return -EACCES;
 	}