* [PATCH 1/2] um: vector: Fix a potential NULL pointer dereference in 'vector_net_open()'
@ 2018-12-26 7:54 Christophe JAILLET
2019-01-08 23:58 ` Kees Cook
0 siblings, 1 reply; 2+ messages in thread
From: Christophe JAILLET @ 2018-12-26 7:54 UTC (permalink / raw)
To: jdike, richard, anton.ivanov, rppt, akpm, yuehaibing, keescook
Cc: linux-um, linux-kernel, kernel-janitors, Christophe JAILLET
'create_queue()' returns NULL in case of memory allocation failure. So we
must check if it succeeds in order to avoid potential NULL pointer
dereference.
For 'vp->rx_queue', the dereference would occur just one line after the
failed allocation. For 'vp->tx_queue', it would occur later during normal
processing.
Fixes: 49da7e64f33e ("High Performance UML Vector Network Driver")
Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
---
arch/um/drivers/vector_kern.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c
index 046fa9ea0ccc..5b917716289d 100644
--- a/arch/um/drivers/vector_kern.c
+++ b/arch/um/drivers/vector_kern.c
@@ -1182,6 +1182,8 @@ static int vector_net_open(struct net_device *dev)
vp->rx_header_size,
MAX_IOV_SIZE
);
+ if (!vp->rx_queue)
+ goto out_close;
vp->rx_queue->queue_depth = get_depth(vp->parsed);
} else {
vp->header_rxbuffer = kmalloc(
@@ -1198,6 +1200,8 @@ static int vector_net_open(struct net_device *dev)
vp->header_size,
MAX_IOV_SIZE
);
+ if (!vp->tx_queue)
+ goto out_close;
} else {
vp->header_txbuffer = kmalloc(vp->header_size, GFP_KERNEL);
if (vp->header_txbuffer == NULL)
--
2.19.1
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH 1/2] um: vector: Fix a potential NULL pointer dereference in 'vector_net_open()'
2018-12-26 7:54 [PATCH 1/2] um: vector: Fix a potential NULL pointer dereference in 'vector_net_open()' Christophe JAILLET
@ 2019-01-08 23:58 ` Kees Cook
0 siblings, 0 replies; 2+ messages in thread
From: Kees Cook @ 2019-01-08 23:58 UTC (permalink / raw)
To: Christophe JAILLET
Cc: Jeff Dike, Richard Weinberger, anton.ivanov, Mike Rapoport,
Andrew Morton, YueHaibing, linux-um, LKML, kernel-janitors
On Fri, Dec 28, 2018 at 1:57 AM Christophe JAILLET
<christophe.jaillet@wanadoo.fr> wrote:
>
> 'create_queue()' returns NULL in case of memory allocation failure. So we
> must check if it succeeds in order to avoid potential NULL pointer
> dereference.
>
> For 'vp->rx_queue', the dereference would occur just one line after the
> failed allocation. For 'vp->tx_queue', it would occur later during normal
> processing.
>
> Fixes: 49da7e64f33e ("High Performance UML Vector Network Driver")
> Signed-off-by: Christophe JAILLET <christophe.jaillet@wanadoo.fr>
Reviewed-by: Kees Cook <keescook@chromium.org>
-Kees
> ---
> arch/um/drivers/vector_kern.c | 4 ++++
> 1 file changed, 4 insertions(+)
>
> diff --git a/arch/um/drivers/vector_kern.c b/arch/um/drivers/vector_kern.c
> index 046fa9ea0ccc..5b917716289d 100644
> --- a/arch/um/drivers/vector_kern.c
> +++ b/arch/um/drivers/vector_kern.c
> @@ -1182,6 +1182,8 @@ static int vector_net_open(struct net_device *dev)
> vp->rx_header_size,
> MAX_IOV_SIZE
> );
> + if (!vp->rx_queue)
> + goto out_close;
> vp->rx_queue->queue_depth = get_depth(vp->parsed);
> } else {
> vp->header_rxbuffer = kmalloc(
> @@ -1198,6 +1200,8 @@ static int vector_net_open(struct net_device *dev)
> vp->header_size,
> MAX_IOV_SIZE
> );
> + if (!vp->tx_queue)
> + goto out_close;
> } else {
> vp->header_txbuffer = kmalloc(vp->header_size, GFP_KERNEL);
> if (vp->header_txbuffer == NULL)
> --
> 2.19.1
>
--
Kees Cook
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2019-01-08 23:58 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-12-26 7:54 [PATCH 1/2] um: vector: Fix a potential NULL pointer dereference in 'vector_net_open()' Christophe JAILLET
2019-01-08 23:58 ` Kees Cook
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).