[PATCH] caif: don't set connection request param size before copying data

Subsystems: networking [general], the rest

STALE5757d

2 messages, 2 authors, 2011-01-11 · open the first message on its own page

[PATCH] caif: don't set connection request param size before copying data

From: Dan Rosenberg <hidden>
Date: 2011-01-10 23:36:41

The size field should not be set until after the data is successfully
copied in.

Signed-off-by: Dan Rosenberg <redacted>
---
 net/caif/caif_socket.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/net/caif/caif_socket.c b/net/caif/caif_socket.c
index 1bf0cf5..8184c03 100644
--- a/net/caif/caif_socket.c
+++ b/net/caif/caif_socket.c
@@ -740,12 +740,12 @@ static int setsockopt(struct socket *sock,
 		if (cf_sk->sk.sk_protocol != CAIFPROTO_UTIL)
 			return -ENOPROTOOPT;
 		lock_sock(&(cf_sk->sk));
-		cf_sk->conn_req.param.size = ol;
 		if (ol > sizeof(cf_sk->conn_req.param.data) ||
 			copy_from_user(&cf_sk->conn_req.param.data, ov, ol)) {
 			release_sock(&cf_sk->sk);
 			return -EINVAL;
 		}
+		cf_sk->conn_req.param.size = ol;
 		release_sock(&cf_sk->sk);
 		return 0;
 

Re: [PATCH] caif: don't set connection request param size before copying data

From: David Miller <davem@davemloft.net>
Date: 2011-01-11 00:00:29

From: Dan Rosenberg <redacted>
Date: Mon, 10 Jan 2011 18:36:37 -0500
The size field should not be set until after the data is successfully
copied in.

Signed-off-by: Dan Rosenberg <redacted>
Applied, thanks.
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help