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

Commit ddb37125 authored by Richard Alpe's avatar Richard Alpe Committed by David S. Miller
Browse files

tipc: safely copy UDP netlink data from user 



The netlink policy for TIPC_NLA_UDP_LOCAL and TIPC_NLA_UDP_REMOTE
is of type binary with a defined length. This causes the policy
framework to threat the defined length as maximum length.

There is however no protection against a user sending a smaller
amount of data. Prior to this patch this wasn't handled which could
result in a partially incomplete sockaddr_storage struct containing
uninitialized data.

In this patch we use nla_memcpy() when copying the user data. This
ensures a potential gap at the end is cleared out properly.

This was found by Julia with Coccinelle tool.

Reported-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Reported-by: default avatarJulia Lawall <julia.lawall@lip6.fr>
Signed-off-by: default avatarRichard Alpe <richard.alpe@ericsson.com>
Acked-by: default avatarJon Maloy <jon.maloy@ericsson.com>
Reviewed-by: default avatarErik Hugne <erik.hugne@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 2837f39c

net/tipc/udp_media.c

+13 −11
Original line number Original line Diff line number Diff line
@@ -276,7 +276,7 @@ static int parse_options(struct nlattr *attrs[], struct udp_bearer *ub, 
			 struct udp_media_addr *remote)

			 struct udp_media_addr *remote)

{

{

	struct nlattr *opts[TIPC_NLA_UDP_MAX + 1];

	struct nlattr *opts[TIPC_NLA_UDP_MAX + 1];

	struct sockaddr_storage *sa_local, *sa_remote;

	struct sockaddr_storage sa_local, sa_remote;





	if (!attrs[TIPC_NLA_BEARER_UDP_OPTS])

	if (!attrs[TIPC_NLA_BEARER_UDP_OPTS])

		goto err;

		goto err;
@@ -285,41 +285,43 @@ static int parse_options(struct nlattr *attrs[], struct udp_bearer *ub, 
			     tipc_nl_udp_policy))

			     tipc_nl_udp_policy))

		goto err;

		goto err;

	if (opts[TIPC_NLA_UDP_LOCAL] && opts[TIPC_NLA_UDP_REMOTE]) {

	if (opts[TIPC_NLA_UDP_LOCAL] && opts[TIPC_NLA_UDP_REMOTE]) {

		sa_local = nla_data(opts[TIPC_NLA_UDP_LOCAL]);

		nla_memcpy(&sa_local, opts[TIPC_NLA_UDP_LOCAL],

		sa_remote = nla_data(opts[TIPC_NLA_UDP_REMOTE]);

			   sizeof(sa_local));

		nla_memcpy(&sa_remote, opts[TIPC_NLA_UDP_REMOTE],

			   sizeof(sa_remote));

	} else {

	} else {

err:

err:

		pr_err("Invalid UDP bearer configuration");

		pr_err("Invalid UDP bearer configuration");

		return -EINVAL;

		return -EINVAL;

	}

	}

	if ((sa_local->ss_family & sa_remote->ss_family) == AF_INET) {

	if ((sa_local.ss_family & sa_remote.ss_family) == AF_INET) {

		struct sockaddr_in *ip4;

		struct sockaddr_in *ip4;





		ip4 = (struct sockaddr_in *)sa_local;

		ip4 = (struct sockaddr_in *)&sa_local;

		local->proto = htons(ETH_P_IP);

		local->proto = htons(ETH_P_IP);

		local->udp_port = ip4->sin_port;

		local->udp_port = ip4->sin_port;

		local->ipv4.s_addr = ip4->sin_addr.s_addr;

		local->ipv4.s_addr = ip4->sin_addr.s_addr;





		ip4 = (struct sockaddr_in *)sa_remote;

		ip4 = (struct sockaddr_in *)&sa_remote;

		remote->proto = htons(ETH_P_IP);

		remote->proto = htons(ETH_P_IP);

		remote->udp_port = ip4->sin_port;

		remote->udp_port = ip4->sin_port;

		remote->ipv4.s_addr = ip4->sin_addr.s_addr;

		remote->ipv4.s_addr = ip4->sin_addr.s_addr;

		return 0;

		return 0;





#if IS_ENABLED(CONFIG_IPV6)

#if IS_ENABLED(CONFIG_IPV6)

	} else if ((sa_local->ss_family & sa_remote->ss_family) == AF_INET6) {

	} else if ((sa_local.ss_family & sa_remote.ss_family) == AF_INET6) {

		struct sockaddr_in6 *ip6;

		struct sockaddr_in6 *ip6;





		ip6 = (struct sockaddr_in6 *)sa_local;

		ip6 = (struct sockaddr_in6 *)&sa_local;

		local->proto = htons(ETH_P_IPV6);

		local->proto = htons(ETH_P_IPV6);

		local->udp_port = ip6->sin6_port;

		local->udp_port = ip6->sin6_port;

		local->ipv6 = ip6->sin6_addr;

		memcpy(&local->ipv6, &ip6->sin6_addr, sizeof(struct in6_addr));

		ub->ifindex = ip6->sin6_scope_id;

		ub->ifindex = ip6->sin6_scope_id;





		ip6 = (struct sockaddr_in6 *)sa_remote;

		ip6 = (struct sockaddr_in6 *)&sa_remote;

		remote->proto = htons(ETH_P_IPV6);

		remote->proto = htons(ETH_P_IPV6);

		remote->udp_port = ip6->sin6_port;

		remote->udp_port = ip6->sin6_port;

		remote->ipv6 = ip6->sin6_addr;

		memcpy(&remote->ipv6, &ip6->sin6_addr, sizeof(struct in6_addr));

		return 0;

		return 0;

#endif

#endif

	}

	}