Merge "net: ipc_router: Initialize the sockaddr in recvmsg() handler" (9e72d10c) · Commits · e / devices / android_kernel_fairphone_FP3

net/ipc_router/ipc_router_socket.c

+3 −1

Original line number	Diff line number	Diff line
		/* Copyright (c) 2011-2017, The Linux Foundation. All rights reserved.
		/* Copyright (c) 2011-2018, The Linux Foundation. All rights reserved.
		*
		* This program is free software; you can redistribute it and/or modify
		* it under the terms of the GNU General Public License version 2 and
		@@ -146,6 +146,7 @@ static int msm_ipc_router_extract_msg(struct msghdr *m,
		return -EINVAL;
		}
		ctl_msg = (union rr_control_msg *)(temp->data);
		memset(addr, 0x0, sizeof(*addr));
		addr->family = AF_MSM_IPC;
		addr->address.addrtype = MSM_IPC_ADDR_ID;
		addr->address.addr.port_addr.node_id = ctl_msg->cli.node_id;
		@@ -154,6 +155,7 @@ static int msm_ipc_router_extract_msg(struct msghdr *m,
		return offset;
		}
		if (addr && (hdr->type == IPC_ROUTER_CTRL_CMD_DATA)) {
		memset(addr, 0x0, sizeof(*addr));
		addr->family = AF_MSM_IPC;
		addr->address.addrtype = MSM_IPC_ADDR_ID;
		addr->address.addr.port_addr.node_id = hdr->src_node_id;