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

Commit ac32c7f7 authored by Erik Hugne's avatar Erik Hugne Committed by David S. Miller
Browse files

tipc: fix message importance range check 



Commit 3b4f302d ("tipc: eliminate
redundant locking") introduced a bug by removing the sanity check
for message importance, allowing programs to assign any value to
the msg_user field. This will mess up the packet reception logic
and may cause random link resets.

Signed-off-by: default avatarErik Hugne <erik.hugne@ericsson.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 21009686

net/tipc/port.h

+3 −1
Original line number Diff line number Diff line
@@ -179,8 +179,10 @@ static inline int tipc_port_importance(struct tipc_port *port) 
	return msg_importance(&port->phdr);

}



static inline void tipc_port_set_importance(struct tipc_port *port, int imp)

static inline int tipc_port_set_importance(struct tipc_port *port, int imp)

{

	if (imp > TIPC_CRITICAL_IMPORTANCE)

		return -EINVAL

	msg_set_importance(&port->phdr, (u32)imp);

}

net/tipc/socket.c

+1 −1
Original line number Diff line number Diff line
@@ -1973,7 +1973,7 @@ static int tipc_setsockopt(struct socket *sock, int lvl, int opt, 


	switch (opt) {

	case TIPC_IMPORTANCE:

		tipc_port_set_importance(port, value);

		res = tipc_port_set_importance(port, value);

		break;

	case TIPC_SRC_DROPPABLE:

		if (sock->type != SOCK_STREAM)