leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

tipc: fix message importance range check

Browse Source 
Commit 3b4f302d85 ("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: Erik Hugne <erik.hugne@ericsson.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Erik Hugne 2014-08-15 16:44:35 +02:00 committed by David S. Miller
parent 2100968666
commit ac32c7f705
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
net/tipc/port.h
View File

@ -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);
} }

2
net/tipc/socket.c
View File

@ -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)