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

Commit 000c7141 authored by Mohamed Ghannam's avatar Mohamed Ghannam Committed by Greg Kroah-Hartman
Browse files

net: ipv4: fix for a race condition in raw_sendmsg 




[ Upstream commit 8f659a03a0ba9289b9aeb9b4470e6fb263d6f483 ]

inet->hdrincl is racy, and could lead to uninitialized stack pointer
usage, so its value should be read only once.

Fixes: c008ba5bdc9f ("ipv4: Avoid reading user iov twice after raw_probe_proto_opt")
Signed-off-by: default avatarMohamed Ghannam <simo.ghannam@gmail.com>
Reviewed-by: default avatarEric Dumazet <edumazet@google.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 986444ea

net/ipv4/raw.c

+10 −5
Original line number Diff line number Diff line
@@ -483,11 +483,16 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 
	u8  tos;

	int err;

	struct ip_options_data opt_copy;

	int hdrincl;



	err = -EMSGSIZE;

	if (len > 0xFFFF)

		goto out;



	/* hdrincl should be READ_ONCE(inet->hdrincl)

	 * but READ_ONCE() doesn't work with bit fields

	 */

	hdrincl = inet->hdrincl;

	/*

	 *	Check the flags.

	 */
@@ -560,7 +565,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 
		/* Linux does not mangle headers on raw sockets,

		 * so that IP options + IP_HDRINCL is non-sense.

		 */

		if (inet->hdrincl)

		if (hdrincl)

			goto done;

		if (ipc.opt->opt.srr) {

			if (!daddr)
@@ -582,12 +587,12 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 


	flowi4_init_output(&fl4, ipc.oif, sk->sk_mark, tos,

			   RT_SCOPE_UNIVERSE,

			   inet->hdrincl ? IPPROTO_RAW : sk->sk_protocol,

			   hdrincl ? IPPROTO_RAW : sk->sk_protocol,

			   inet_sk_flowi_flags(sk) |

			    (inet->hdrincl ? FLOWI_FLAG_KNOWN_NH : 0),

			    (hdrincl ? FLOWI_FLAG_KNOWN_NH : 0),

			   daddr, saddr, 0, 0);



	if (!inet->hdrincl) {

	if (!hdrincl) {

		err = raw_probe_proto_opt(&fl4, msg);

		if (err)

			goto done;
@@ -609,7 +614,7 @@ static int raw_sendmsg(struct kiocb *iocb, struct sock *sk, struct msghdr *msg, 
		goto do_confirm;

back_from_confirm:



	if (inet->hdrincl)

	if (hdrincl)

		err = raw_send_hdrinc(sk, &fl4, msg->msg_iov, len,

				      &rt, msg->msg_flags);