Skip to content

Commit

Permalink
NET: NETROM: When adding a route verify length of mnemonic string.
Browse files Browse the repository at this point in the history
struct nr_route_struct's mnemonic permits a string of up to 7 bytes to be
used.  If userland passes a not zero terminated string to the kernel adding
a node to the routing table might result in the kernel attempting to read
copy a too long string.

Mnemonic is part of the NET/ROM routing protocol; NET/ROM routing table
updates only broadcast 6 bytes.  The 7th byte in the mnemonic array exists
only as a \0 termination character for the kernel code's convenience.

Fixed by rejecting mnemonic strings that have no terminating \0 in the first
7 characters.  Do this test only NETROM_NODE to avoid breaking NETROM_NEIGH
where userland might passing an uninitialized mnemonic field.

Initial patch by Dan Carpenter <[email protected]>.

Signed-off-by: Ralf Baechle <[email protected]>
Cc: Dan Carpenter <[email protected]>
Cc: Walter Harms <[email protected]>
Cc: Thomas Osterried <[email protected]>
Acked-by: Dan Carpenter <[email protected]>
Signed-off-by: David S. Miller <[email protected]>
  • Loading branch information
ralfbaechle authored and davem330 committed Nov 29, 2011
1 parent be639ac commit ac1a1de
Showing 1 changed file with 5 additions and 0 deletions.
5 changes: 5 additions & 0 deletions net/netrom/nr_route.c
Original file line number Diff line number Diff line change
Expand Up @@ -678,6 +678,11 @@ int nr_rt_ioctl(unsigned int cmd, void __user *arg)
}
switch (nr_route.type) {
case NETROM_NODE:
if (strnlen(nr_route.mnemonic, 7) == 7) {
ret = -EINVAL;
break;
}

ret = nr_add_node(&nr_route.callsign,
nr_route.mnemonic,
&nr_route.neighbour,
Expand Down

0 comments on commit ac1a1de

Please sign in to comment.