diff mbox

[net] tipc: fix message importance range check

Message ID 1408113875-30655-1-git-send-email-erik.hugne@ericsson.com
State Accepted, archived
Delegated to: David Miller
Headers show

Commit Message

Erik Hugne Aug. 15, 2014, 2:44 p.m. UTC 
From: Erik Hugne <erik.hugne@ericsson.com>

Commit 3b4f302d8578 ("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>
---
 net/tipc/port.h   | 4 +++-
 net/tipc/socket.c | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

Comments

David Miller Aug. 17, 2014, 3:17 a.m. UTC | #1 
From: <erik.hugne@ericsson.com>
Date: Fri, 15 Aug 2014 16:44:35 +0200

> From: Erik Hugne <erik.hugne@ericsson.com>
> 
> Commit 3b4f302d8578 ("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>

Applied, thank you.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Dmitry Popov Aug. 17, 2014, 11 a.m. UTC | #2 
On Fri, 15 Aug 2014 16:44:35 +0200
<erik.hugne@ericsson.com> wrote:

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

1) Semicolon is missing after return -EINVAL,
2) return 0 is missing at the end of this function.
--
To unsubscribe from this list: send the line "unsubscribe netdev" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/net/tipc/port.h b/net/tipc/port.h
index 3f93454..a69118f 100644
--- a/net/tipc/port.h
+++ b/net/tipc/port.h
@@ -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);
 }
 
diff --git a/net/tipc/socket.c b/net/tipc/socket.c
index 7d423ee..ff8c811 100644
--- a/net/tipc/socket.c
+++ b/net/tipc/socket.c
@@ -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)