* [PATCH net] vsock: cope with memory allocation failure at socket creation time
@ 2019-02-07 13:13 Paolo Abeni
2019-02-07 13:37 ` Stefano Garzarella
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Paolo Abeni @ 2019-02-07 13:13 UTC (permalink / raw)
To: netdev; +Cc: David S. Miller, Jorgen Hansen, Stefano Garzarella
In the unlikely event that the kmalloc call in vmci_transport_socket_init()
fails, we end-up calling vmci_transport_destruct() with a NULL vmci_trans()
and oopsing.
This change addresses the above explicitly checking for zero vmci_trans()
at destruction time.
Reported-by: Xiumei Mu <xmu@redhat.com>
Fixes: d021c344051a ("VSOCK: Introduce VM Sockets")
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
---
net/vmw_vsock/vmci_transport.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/net/vmw_vsock/vmci_transport.c b/net/vmw_vsock/vmci_transport.c
index c361ce782412..c3d5ab01fba7 100644
--- a/net/vmw_vsock/vmci_transport.c
+++ b/net/vmw_vsock/vmci_transport.c
@@ -1651,6 +1651,10 @@ static void vmci_transport_cleanup(struct work_struct *work)
static void vmci_transport_destruct(struct vsock_sock *vsk)
{
+ /* transport can be NULL if we hit a failure at init() time */
+ if (!vmci_trans(vsk))
+ return;
+
/* Ensure that the detach callback doesn't use the sk/vsk
* we are about to destruct.
*/
--
2.20.1
^ permalink raw reply related [flat|nested] 4+ messages in thread* Re: [PATCH net] vsock: cope with memory allocation failure at socket creation time
2019-02-07 13:13 [PATCH net] vsock: cope with memory allocation failure at socket creation time Paolo Abeni
@ 2019-02-07 13:37 ` Stefano Garzarella
2019-02-07 14:00 ` Jorgen S. Hansen
2019-02-09 6:32 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Stefano Garzarella @ 2019-02-07 13:37 UTC (permalink / raw)
To: Paolo Abeni; +Cc: netdev, David S. Miller, Jorgen Hansen
On Thu, Feb 07, 2019 at 02:13:18PM +0100, Paolo Abeni wrote:
> In the unlikely event that the kmalloc call in vmci_transport_socket_init()
> fails, we end-up calling vmci_transport_destruct() with a NULL vmci_trans()
> and oopsing.
>
> This change addresses the above explicitly checking for zero vmci_trans()
> at destruction time.
>
> Reported-by: Xiumei Mu <xmu@redhat.com>
> Fixes: d021c344051a ("VSOCK: Introduce VM Sockets")
> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
> ---
> net/vmw_vsock/vmci_transport.c | 4 ++++
> 1 file changed, 4 insertions(+)
Reviewed-by: Stefano Garzarella <sgarzare@redhat.com>
Thanks,
Stefano
^ permalink raw reply [flat|nested] 4+ messages in thread* RE: [PATCH net] vsock: cope with memory allocation failure at socket creation time
2019-02-07 13:13 [PATCH net] vsock: cope with memory allocation failure at socket creation time Paolo Abeni
2019-02-07 13:37 ` Stefano Garzarella
@ 2019-02-07 14:00 ` Jorgen S. Hansen
2019-02-09 6:32 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: Jorgen S. Hansen @ 2019-02-07 14:00 UTC (permalink / raw)
To: 'Paolo Abeni', netdev@vger.kernel.org
Cc: David S. Miller, Stefano Garzarella
> In the unlikely event that the kmalloc call in vmci_transport_socket_init()
> fails, we end-up calling vmci_transport_destruct() with a NULL vmci_trans()
> and oopsing.
>
> This change addresses the above explicitly checking for zero vmci_trans() at
> destruction time.
>
> Reported-by: Xiumei Mu <xmu@redhat.com>
> Fixes: d021c344051a ("VSOCK: Introduce VM Sockets")
> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
> ---
> net/vmw_vsock/vmci_transport.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/net/vmw_vsock/vmci_transport.c
> b/net/vmw_vsock/vmci_transport.c index c361ce782412..c3d5ab01fba7
> 100644
> --- a/net/vmw_vsock/vmci_transport.c
> +++ b/net/vmw_vsock/vmci_transport.c
> @@ -1651,6 +1651,10 @@ static void vmci_transport_cleanup(struct
> work_struct *work)
>
> static void vmci_transport_destruct(struct vsock_sock *vsk) {
> + /* transport can be NULL if we hit a failure at init() time */
> + if (!vmci_trans(vsk))
> + return;
> +
> /* Ensure that the detach callback doesn't use the sk/vsk
> * we are about to destruct.
> */
> --
> 2.20.1
Reviewed-by: Jorgen Hansen <jhansen@vmware.com>
Thanks for fixing this,
Jorgen
^ permalink raw reply [flat|nested] 4+ messages in thread* Re: [PATCH net] vsock: cope with memory allocation failure at socket creation time
2019-02-07 13:13 [PATCH net] vsock: cope with memory allocation failure at socket creation time Paolo Abeni
2019-02-07 13:37 ` Stefano Garzarella
2019-02-07 14:00 ` Jorgen S. Hansen
@ 2019-02-09 6:32 ` David Miller
2 siblings, 0 replies; 4+ messages in thread
From: David Miller @ 2019-02-09 6:32 UTC (permalink / raw)
To: pabeni; +Cc: netdev, jhansen, sgarzare
From: Paolo Abeni <pabeni@redhat.com>
Date: Thu, 7 Feb 2019 14:13:18 +0100
> In the unlikely event that the kmalloc call in vmci_transport_socket_init()
> fails, we end-up calling vmci_transport_destruct() with a NULL vmci_trans()
> and oopsing.
>
> This change addresses the above explicitly checking for zero vmci_trans()
> at destruction time.
>
> Reported-by: Xiumei Mu <xmu@redhat.com>
> Fixes: d021c344051a ("VSOCK: Introduce VM Sockets")
> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Applied and queued up for -stable, thanks.
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2019-02-09 6:32 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-02-07 13:13 [PATCH net] vsock: cope with memory allocation failure at socket creation time Paolo Abeni
2019-02-07 13:37 ` Stefano Garzarella
2019-02-07 14:00 ` Jorgen S. Hansen
2019-02-09 6:32 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox