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

Commit f81152e3 authored by Florian Westphal's avatar Florian Westphal Committed by David S. Miller
Browse files

net: rose: restore old recvmsg behavior 



recvmsg handler in net/rose/af_rose.c performs size-check ->msg_namelen.

After commit f3d33426
(net: rework recvmsg handler msg_name and msg_namelen logic), we now
always take the else branch due to namelen being initialized to 0.

Digging in netdev-vger-cvs git repo shows that msg_namelen was
initialized with a fixed-size since at least 1995, so the else branch
was never taken.

Compile tested only.

Signed-off-by: default avatarFlorian Westphal <fw@strlen.de>
Acked-by: default avatarHannes Frederic Sowa <hannes@stressinduktion.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ac3d5ac2

net/rose/af_rose.c

+4 −12
Original line number Diff line number Diff line
@@ -1253,6 +1253,7 @@ static int rose_recvmsg(struct kiocb *iocb, struct socket *sock, 


	if (msg->msg_name) {

		struct sockaddr_rose *srose;

		struct full_sockaddr_rose *full_srose = msg->msg_name;



		memset(msg->msg_name, 0, sizeof(struct full_sockaddr_rose));

		srose = msg->msg_name;
@@ -1260,18 +1261,9 @@ static int rose_recvmsg(struct kiocb *iocb, struct socket *sock, 
		srose->srose_addr   = rose->dest_addr;

		srose->srose_call   = rose->dest_call;

		srose->srose_ndigis = rose->dest_ndigis;

		if (msg->msg_namelen >= sizeof(struct full_sockaddr_rose)) {

			struct full_sockaddr_rose *full_srose = (struct full_sockaddr_rose *)msg->msg_name;

		for (n = 0 ; n < rose->dest_ndigis ; n++)

			full_srose->srose_digis[n] = rose->dest_digis[n];

		msg->msg_namelen = sizeof(struct full_sockaddr_rose);

		} else {

			if (rose->dest_ndigis >= 1) {

				srose->srose_ndigis = 1;

				srose->srose_digi = rose->dest_digis[0];

			}

			msg->msg_namelen = sizeof(struct sockaddr_rose);

		}

	}



	skb_free_datagram(sk, skb);