* [PATCH v2] can: test size of struct sockaddr in sendmsg
@ 2011-01-15 19:39 Kurt Van Dijck
2011-01-16 4:56 ` David Miller
0 siblings, 1 reply; 2+ messages in thread
From: Kurt Van Dijck @ 2011-01-15 19:39 UTC (permalink / raw)
To: netdev-u79uwXL29TY76Z2rM5mHXA,
socketcan-core-0fE9KPoRgkgATYTw5x5z8w, Oliver Hartkopp
This patch makes the CAN socket code conform to the manpage of sendmsg.
Signed-off-by: Kurt Van Dijck <kurt.van.dijck-/BeEPy95v10@public.gmane.org>
Acked-by: Oliver Hartkopp <socketcan-fJ+pQTUTwRTk1uMJSBkQmQ@public.gmane.org>
---
net/can/bcm.c | 3 +++
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 6faa825..2f804e4 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 e88f610..883e9d7 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;
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH v2] can: test size of struct sockaddr in sendmsg
2011-01-15 19:39 [PATCH v2] can: test size of struct sockaddr in sendmsg Kurt Van Dijck
@ 2011-01-16 4:56 ` David Miller
0 siblings, 0 replies; 2+ messages in thread
From: David Miller @ 2011-01-16 4:56 UTC (permalink / raw)
To: kurt.van.dijck; +Cc: netdev, socketcan-core, socketcan
From: Kurt Van Dijck <kurt.van.dijck@eia.be>
Date: Sat, 15 Jan 2011 20:39:16 +0100
> 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>
Applied, thanks.
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2011-01-16 4:56 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2011-01-15 19:39 [PATCH v2] can: test size of struct sockaddr in sendmsg Kurt Van Dijck
2011-01-16 4:56 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).