[PATCH 5/9] rxrpc: Check address length before reading srx_service field

[PATCH 5/9] rxrpc: Check address length before reading srx_service field

[Tetsuo Handa]

KMSAN will complain if valid address length passed to bind() is shorter
than sizeof(struct sockaddr_rxrpc) bytes.

Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
---
 net/rxrpc/af_rxrpc.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/net/rxrpc/af_rxrpc.c b/net/rxrpc/af_rxrpc.c
index 96f2952bbdfd..c54dce3ca0dd 100644
--- a/net/rxrpc/af_rxrpc.c
+++ b/net/rxrpc/af_rxrpc.c
@@ -135,7 +135,7 @@ static int rxrpc_bind(struct socket *sock, struct sockaddr *saddr, int len)
 	struct sockaddr_rxrpc *srx = (struct sockaddr_rxrpc *)saddr;
 	struct rxrpc_local *local;
 	struct rxrpc_sock *rx = rxrpc_sk(sock->sk);
-	u16 service_id = srx->srx_service;
+	u16 service_id;
 	int ret;
 
 	_enter("%p,%p,%d", rx, saddr, len);
@@ -143,6 +143,7 @@ static int rxrpc_bind(struct socket *sock, struct sockaddr *saddr, int len)
 	ret = rxrpc_validate_address(rx, srx, len);
 	if (ret < 0)
 		goto error;
+	service_id = srx->srx_service;
 
 	lock_sock(&rx->sk);
 
-- 
2.16.5

Re: [PATCH 5/9] rxrpc: Check address length before reading srx_service field

[David Howells]

Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> wrote:

> KMSAN will complain if valid address length passed to bind() is shorter
> than sizeof(struct sockaddr_rxrpc) bytes.

Do you want me to add this to my rxrpc-fixes branch?

David

Re: [PATCH 5/9] rxrpc: Check address length before reading srx_service field

[Tetsuo Handa]

On 2019/04/12 21:18, David Howells wrote:
> Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp> wrote:
> 
>> KMSAN will complain if valid address length passed to bind() is shorter
>> than sizeof(struct sockaddr_rxrpc) bytes.
> 
> Do you want me to add this to my rxrpc-fixes branch?
> 

Yes, please.

> David
> 

Re: [PATCH 5/9] rxrpc: Check address length before reading srx_service field

[David Howells]

Tetsuo Handa <penguin-kernel@i-love.sakura.ne.jp> wrote:

> > Do you want me to add this to my rxrpc-fixes branch?
> > 
> 
> Yes, please.

Sorry, saw your reply right after posting my patches.  Will forward yours on
next.

David

Re: [PATCH 5/9] rxrpc: Check address length before reading srx_service field

[David Miller]

From: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>
Date: Fri, 12 Apr 2019 19:54:05 +0900

> KMSAN will complain if valid address length passed to bind() is shorter
> than sizeof(struct sockaddr_rxrpc) bytes.
> 
> Signed-off-by: Tetsuo Handa <penguin-kernel@I-love.SAKURA.ne.jp>

I know David said he'd take it, but I'll take it too, no harm in that.