diff options
| author |   Kurt Van Dijck <kurt.van.dijck@eia.be> | 2011-01-15 20:56:42 -0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2011-01-15 20:56:42 -0800 |
| commit | 5e5073280379d38e86ade471daa7443b553fc839 (patch) | |
| tree | 18b76f530ec22b57b36de68b985ad32444066dcc /net | |
| parent | Merge branch 'for-david' of git://git.open-mesh.org/ecsv/linux-merge (diff) | |
| download | linux-dev-5e5073280379d38e86ade471daa7443b553fc839.tar.xz linux-dev-5e5073280379d38e86ade471daa7443b553fc839.zip | |
can: test size of struct sockaddr in sendmsg
This patch makes the CAN socket code conform to the manpage of sendmsg.
Signed-off-by: Kurt Van Dijck <kurt.van.dijck@eia.be>
Acked-by: Oliver Hartkopp <socketcan@hartkopp.net>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'net')
| -rw-r--r-- | net/can/bcm.c | 3 | ||||
| -rw-r--r-- | net/can/raw.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/net/can/bcm.c b/net/can/bcm.c index 9d5e8accfab1..092dc88a7c64 100644 --- a/net/can/bcm.c +++ b/net/can/bcm.c @@ -1256,6 +1256,9 @@ static int bcm_sendmsg(struct kiocb *iocb, struct socket *sock, struct sockaddr_can *addr = (struct sockaddr_can *)msg->msg_name; + if (msg->msg_namelen < sizeof(*addr)) + return -EINVAL; + if (addr->can_family != AF_CAN) return -EINVAL; diff --git a/net/can/raw.c b/net/can/raw.c index e88f610fdb7b..883e9d74fddf 100644 --- a/net/can/raw.c +++ b/net/can/raw.c @@ -649,6 +649,9 @@ static int raw_sendmsg(struct kiocb *iocb, struct socket *sock, struct sockaddr_can *addr = (struct sockaddr_can *)msg->msg_name; + if (msg->msg_namelen < sizeof(*addr)) + return -EINVAL; + if (addr->can_family != AF_CAN) return -EINVAL; |