* [PATCH 1/1] net: ehea: avoid null pointer dereference
@ 2016-05-17 20:28 Heinrich Schuchardt
2016-05-17 21:33 ` Thadeu Lima de Souza Cascardo
2016-05-19 18:26 ` David Miller
0 siblings, 2 replies; 3+ messages in thread
From: Heinrich Schuchardt @ 2016-05-17 20:28 UTC (permalink / raw)
To: Thadeu Lima de Souza Cascardo
Cc: David S. Miller, netdev, linux-kernel, Heinrich Schuchardt
ehea_get_port may return NULL. Do not dereference NULL value.
Fixes: 8c4877a4128e ("ehea: Use the standard logging functions")
Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
---
drivers/net/ethernet/ibm/ehea/ehea_main.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
index 2a0dc12..54efa9a 100644
--- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
+++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
@@ -1169,16 +1169,15 @@ static void ehea_parse_eqe(struct ehea_adapter *adapter, u64 eqe)
ec = EHEA_BMASK_GET(NEQE_EVENT_CODE, eqe);
portnum = EHEA_BMASK_GET(NEQE_PORTNUM, eqe);
port = ehea_get_port(adapter, portnum);
+ if (!port) {
+ netdev_err(NULL, "unknown portnum %x\n", portnum);
+ return;
+ }
dev = port->netdev;
switch (ec) {
case EHEA_EC_PORTSTATE_CHG: /* port state change */
- if (!port) {
- netdev_err(dev, "unknown portnum %x\n", portnum);
- break;
- }
-
if (EHEA_BMASK_GET(NEQE_PORT_UP, eqe)) {
if (!netif_carrier_ok(dev)) {
ret = ehea_sense_port_attr(port);
--
2.1.4
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] net: ehea: avoid null pointer dereference
2016-05-17 20:28 [PATCH 1/1] net: ehea: avoid null pointer dereference Heinrich Schuchardt
@ 2016-05-17 21:33 ` Thadeu Lima de Souza Cascardo
2016-05-19 18:26 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: Thadeu Lima de Souza Cascardo @ 2016-05-17 21:33 UTC (permalink / raw)
To: Heinrich Schuchardt; +Cc: David S. Miller, netdev, linux-kernel
On Tue, May 17, 2016 at 10:28:54PM +0200, Heinrich Schuchardt wrote:
> ehea_get_port may return NULL. Do not dereference NULL value.
>
> Fixes: 8c4877a4128e ("ehea: Use the standard logging functions")
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Acked-by: Thadeu Lima de Souza Cascardo <cascardo@debian.org>
> ---
> drivers/net/ethernet/ibm/ehea/ehea_main.c | 9 ++++-----
> 1 file changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/drivers/net/ethernet/ibm/ehea/ehea_main.c b/drivers/net/ethernet/ibm/ehea/ehea_main.c
> index 2a0dc12..54efa9a 100644
> --- a/drivers/net/ethernet/ibm/ehea/ehea_main.c
> +++ b/drivers/net/ethernet/ibm/ehea/ehea_main.c
> @@ -1169,16 +1169,15 @@ static void ehea_parse_eqe(struct ehea_adapter *adapter, u64 eqe)
> ec = EHEA_BMASK_GET(NEQE_EVENT_CODE, eqe);
> portnum = EHEA_BMASK_GET(NEQE_PORTNUM, eqe);
> port = ehea_get_port(adapter, portnum);
> + if (!port) {
> + netdev_err(NULL, "unknown portnum %x\n", portnum);
> + return;
> + }
> dev = port->netdev;
>
> switch (ec) {
> case EHEA_EC_PORTSTATE_CHG: /* port state change */
>
> - if (!port) {
> - netdev_err(dev, "unknown portnum %x\n", portnum);
> - break;
> - }
> -
> if (EHEA_BMASK_GET(NEQE_PORT_UP, eqe)) {
> if (!netif_carrier_ok(dev)) {
> ret = ehea_sense_port_attr(port);
> --
> 2.1.4
>
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: [PATCH 1/1] net: ehea: avoid null pointer dereference
2016-05-17 20:28 [PATCH 1/1] net: ehea: avoid null pointer dereference Heinrich Schuchardt
2016-05-17 21:33 ` Thadeu Lima de Souza Cascardo
@ 2016-05-19 18:26 ` David Miller
1 sibling, 0 replies; 3+ messages in thread
From: David Miller @ 2016-05-19 18:26 UTC (permalink / raw)
To: xypron.glpk; +Cc: cascardo, netdev, linux-kernel
From: Heinrich Schuchardt <xypron.glpk@gmx.de>
Date: Tue, 17 May 2016 22:28:54 +0200
> ehea_get_port may return NULL. Do not dereference NULL value.
>
> Fixes: 8c4877a4128e ("ehea: Use the standard logging functions")
> Signed-off-by: Heinrich Schuchardt <xypron.glpk@gmx.de>
Applied.
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-05-19 18:26 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-05-17 20:28 [PATCH 1/1] net: ehea: avoid null pointer dereference Heinrich Schuchardt
2016-05-17 21:33 ` Thadeu Lima de Souza Cascardo
2016-05-19 18:26 ` David Miller
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).