Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit eea1a627 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "net: ipc_router: Initialize the sockaddr in recvmsg() handler"

parents 414b079b 596aa5c2

net/ipc_router/ipc_router_socket.c

+2 −0
Original line number Diff line number Diff line
@@ -143,6 +143,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;
@@ -151,6 +152,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;