s390/netiucv: handle memory allocation failure in conn_action_start()
Subsystems (5)
PATCH v2 1/1 s390/netiucv: handle memory allocation failure in conn_action_start()
From: Yunseong Kim <[email protected]>
A null pointer is stored in the data structure member "path" after a call of the function "iucv_path_alloc" failed. This pointer was passed to a subsequent call of the function "iucv_path_connect" where an undesirable dereference will be performed then. Thus add a corresponding return value check. This prevent null pointer dereferenced kernel panic when memory exhausted situation with the netiucv driver operating as an FSM state in "conn_action_start".
--- drivers/s390/net/netiucv.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/s390/net/netiucv.c +3 -0
@@ -855,6 +855,9 @@ static void conn_action_start(fsm_instance *fi, int event, void *arg)fsm_newstate (fi,CONN_STATE_SETUPWAIT ); conn->path =iucv_path_alloc (NETIUCV_QUEUELEN_DEFAULT ,0 ,GFP_KERNEL ); +if (!conn->path) +return ; +IUCV_DBF_TEXT_ (setup,2 ,"%s: connecting to %s ...\n" , netdev->name,netiucv_printuser (conn));
Signature · 1 line
2.45.2
Quoted 1 line
… Thus add a corresponding return value
I suggest to move this sentence into a subsequent text line.
Quoted 3 lines
… This prevent null pointer dereferenced kernel panic when memory
exhausted situation with the netiucv driver operating as an FSM state in "conn_action_start".
Do you find an improved wording still relevant for a separate paragraph?
Quoted 2 lines
Fixes eebce3856737 ("[S390]: Adapt netiucv driver to new IUCV API")
Would you like to specify a “stable tag”?
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/stable-kernel-rules.rst?h=v6.10-rc5#n34
Quoted 1 line
---
I would appreciate a version description behind the marker line.
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/Documentation/process/submitting-patches.rst?h=v6.10-rc5#n713
…
drivers/s390/net/netiucv.c static void conn_action_start(fsm_instance *fi, int event, void *arg) · line 859
Quoted 7 lines
+++
b/drivers/s390/net/netiucv.cdrivers/s390/net/netiucv.c +2
-0@@ -855,6 +855,9 @@ static void conn_action_start(fsm_instance *fi, int event, void *arg)fsm_newstate (fi,CONN_STATE_SETUPWAIT ); conn->path =iucv_path_alloc (NETIUCV_QUEUELEN_DEFAULT ,0 ,GFP_KERNEL ); +if (!conn->path) +return ;
…
Would the following statement variant become more appropriate here?
+ return -ENOMEM;
Regards,
Markus
Alexandra Winter
maintainerQuoted 1 line · On 25.06.24 04:48, [email protected] wrote:
From: Yunseong Kim <[email protected]>
Thank you very much Yunseong, for finding and reporting this potential null-pointer dereference.
And thank you Markus Elfring for your valuable comments.
Quoted 8 lines
A null pointer is stored in the data structure member "path" after a call of the function "
iucv_path_alloc" failed. This pointer was passed to a subsequent call of the function "iucv_path_connect" where an undesirable dereference will be performed then. Thus add a corresponding return value check. This prevent null pointer dereferenced kernel panic when memory exhausted situation with the netiucv driver operating as an FSM state in "conn_action_start".
I would prefer an even shorter commit message. Allocating memory without checking for failure is a common error pattern, I think.
Quoted 19 lines
Fixes eebce3856737 ("[S390]: Adapt netiucv driver to new IUCV API")Signed-off-by Yunseong Kim <[email protected]>--- drivers/s390/net/netiucv.c | 3 +++ 1 file changed, 3 insertions(+)drivers/s390/net/netiucv.c +3
-0@@ -855,6 +855,9 @@ static void conn_action_start(fsm_instance *fi, int event, void *arg)fsm_newstate (fi,CONN_STATE_SETUPWAIT ); conn->path =iucv_path_alloc (NETIUCV_QUEUELEN_DEFAULT ,0 ,GFP_KERNEL ); +if (!conn->path) +return ; +
drivers/s390/net/netiucv.c
Quoted 4 lines · Markus Elfring
Would the following statement variant become more appropriate here?
drivers/s390/net/netiucv.c +1
-0+return -ENOMEM ;
conn_action_start(), like the other fsm functions, does not have a return value. But simply returning will not prevent the next fsm function from trying to use conn->path.
So I think you need to dofsm_newstate(fi, CONN_STATE_CONNERR);
before you return.
You could use rc = -ENOMEM and a goto to the IUCV_DBF_TEXT_ debug message, if you want to. But I am not too concerned about the details of error handling:
If your memory is so scarce that you cannot even allocate a handful of bytes, then you should be seeing warnings all over the place.