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

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
...@@ -179,8 +179,10 @@ static inline int tipc_port_importance(struct tipc_port *port) ...@@ -179,8 +179,10 @@ static inline int tipc_port_importance(struct tipc_port *port)
return msg_importance(&port->phdr); 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); msg_set_importance(&port->phdr, (u32)imp);
} }
......
...@@ -1973,7 +1973,7 @@ static int tipc_setsockopt(struct socket *sock, int lvl, int opt, ...@@ -1973,7 +1973,7 @@ static int tipc_setsockopt(struct socket *sock, int lvl, int opt,
switch (opt) { switch (opt) {
case TIPC_IMPORTANCE: case TIPC_IMPORTANCE:
tipc_port_set_importance(port, value); res = tipc_port_set_importance(port, value);
break; break;
case TIPC_SRC_DROPPABLE: case TIPC_SRC_DROPPABLE:
if (sock->type != SOCK_STREAM) if (sock->type != SOCK_STREAM)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment