From 52e5a32fc1d262cea9e6ed5e5d277aea83cd1326 Mon Sep 17 00:00:00 2001 From: Allan Stephens Date: Sun, 25 Jun 2006 23:44:27 -0700 Subject: [PATCH] --- yaml --- r: 30403 b: refs/heads/master c: 6b384de853c9f05e5e6da6c95edb475b96dd2cc1 h: refs/heads/master i: 30401: 721d930667295414bf8709fa30c1194569110637 30399: 17791267c872b4c09a6da1f889a4ba77a54ded88 v: v3 --- [refs] | 2 +- trunk/net/tipc/socket.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index 77d93f7fed39..05c91180c362 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e9024f0f79c3f847a793d6a16bf4fefc6d7a4649 +refs/heads/master: 6b384de853c9f05e5e6da6c95edb475b96dd2cc1 diff --git a/trunk/net/tipc/socket.c b/trunk/net/tipc/socket.c index 0923213fc6a4..758b2d2d2f9c 100644 --- a/trunk/net/tipc/socket.c +++ b/trunk/net/tipc/socket.c @@ -1244,7 +1244,7 @@ static int connect(struct socket *sock, struct sockaddr *dest, int destlen, if (sock->state != SS_UNCONNECTED) return -EISCONN; - if ((dst->family != AF_TIPC) || + if ((destlen < sizeof(*dst)) || (dst->family != AF_TIPC) || ((dst->addrtype != TIPC_ADDR_NAME) && (dst->addrtype != TIPC_ADDR_ID))) return -EINVAL;