Merge remote-tracking branch 'aosp/android-4.9-q' into int/11/fp3 (23e18815) · Commits · e / devices / android_kernel_fairphone_FP3

Makefile

+1 −1

Original line number	Diff line number	Diff line
		VERSION = 4
		PATCHLEVEL = 9
		SUBLEVEL = 300
		SUBLEVEL = 301
		EXTRAVERSION =
		NAME = Roaring Lionus

drivers/mmc/host/moxart-mmc.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -698,12 +698,12 @@ static int moxart_remove(struct platform_device *pdev)
		if (!IS_ERR(host->dma_chan_rx))
		dma_release_channel(host->dma_chan_rx);
		mmc_remove_host(mmc);
		mmc_free_host(mmc);

		writel(0, host->base + REG_INTERRUPT_MASK);
		writel(0, host->base + REG_POWER_CONTROL);
		writel(readl(host->base + REG_CLOCK_CONTROL) \| CLK_OFF,
		host->base + REG_CLOCK_CONTROL);
		mmc_free_host(mmc);
		}
		return 0;
		}

kernel/cgroup.c

+26 −0

Original line number	Diff line number	Diff line
		@@ -1835,6 +1835,7 @@ static int cgroup_remount(struct kernfs_root kf_root, int flags, char *data)
		{
		int ret = 0;
		struct cgroup_root *root = cgroup_root_from_kf(kf_root);
		struct cgroup_namespace *ns = current->nsproxy->cgroup_ns;
		struct cgroup_sb_opts opts;
		u16 added_mask, removed_mask;

		@@ -1854,6 +1855,13 @@ static int cgroup_remount(struct kernfs_root kf_root, int flags, char *data)
		pr_warn("option changes via remount are deprecated (pid=%d comm=%s)\n",
		task_tgid_nr(current), current->comm);

		/* See cgroup_mount release_agent handling */
		if (opts.release_agent &&
		((ns->user_ns != &init_user_ns) \|\| !capable(CAP_SYS_ADMIN))) {
		ret = -EINVAL;
		goto out_unlock;
		}

		added_mask = opts.subsys_mask & ~root->subsys_mask;
		removed_mask = root->subsys_mask & ~opts.subsys_mask;

		@@ -2232,6 +2240,16 @@ static struct dentry cgroup_mount(struct file_system_type fs_type,
		goto out_unlock;
		}

		/*
		* Release agent gets called with all capabilities,
		* require capabilities to set release agent.
		*/
		if (opts.release_agent &&
		((ns->user_ns != &init_user_ns) \|\| !capable(CAP_SYS_ADMIN))) {
		ret = -EINVAL;
		goto out_unlock;
		}

		root = kzalloc(sizeof(*root), GFP_KERNEL);
		if (!root) {
		ret = -ENOMEM;
		@@ -3031,6 +3049,14 @@ static ssize_t cgroup_release_agent_write(struct kernfs_open_file *of,

		BUILD_BUG_ON(sizeof(cgrp->root->release_agent_path) < PATH_MAX);

		/*
		* Release agent gets called with all capabilities,
		* require capabilities to set release agent.
		*/
		if ((of->file->f_cred->user_ns != &init_user_ns) \|\|
		!capable(CAP_SYS_ADMIN))
		return -EPERM;

		cgrp = cgroup_kn_lock_live(of->kn, false);
		if (!cgrp)
		return -ENODEV;

net/tipc/link.c

+4 −1

Original line number	Diff line number	Diff line
		@@ -1441,12 +1441,15 @@ static int tipc_link_proto_rcv(struct tipc_link l, struct sk_buff skb,
		u16 peers_tol = msg_link_tolerance(hdr);
		u16 peers_prio = msg_linkprio(hdr);
		u16 rcv_nxt = l->rcv_nxt;
		u16 dlen = msg_data_sz(hdr);
		u32 dlen = msg_data_sz(hdr);
		int mtyp = msg_type(hdr);
		void *data;
		char *if_name;
		int rc = 0;

		if (dlen > U16_MAX)
		goto exit;

		if (tipc_link_is_blocked(l) \|\| !xmitq)
		goto exit;

net/tipc/monitor.c

+2 −0

Original line number	Diff line number	Diff line
		@@ -457,6 +457,8 @@ void tipc_mon_rcv(struct net net, void data, u16 dlen, u32 addr,
		state->probing = false;

		/* Sanity check received domain record */
		if (new_member_cnt > MAX_MON_DOMAIN)
		return;
		if (dlen < dom_rec_len(arrv_dom, 0))
		return;
		if (dlen != dom_rec_len(arrv_dom, new_member_cnt))