leandrof/u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: Protect net_state from reentrant net_loop()

Browse Source 
Global variable "net_state" is used in net_loop() state-machine.
But it happens that some times the net_loop() can be called
multiple times in the same call stack. For example when the
netconsole is enabled and we print the message while some other
net protocol is in action. Netconsole will overwrite the "net_state"
and that will break the logic for earlier started protocol.

To protect the state save and restore "net_state" variable each
time when we enter and exit net_loop().

Signed-off-by: Leonid Iziumtsev <leonid.iziumtsev@se.atlascopco.com>
Acked-by: Joe Hershberger <joe.hershberger@ni.com>
This commit is contained in:
Leonid Iziumtsev 2018-05-08 15:55:50 +02:00 committed by Joe Hershberger
parent 552e7c57d0
commit 60177b2617
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
net/net.c
View File

@ -393,6 +393,7 @@ void net_init(void)
int net_loop(enum proto_t protocol)
{
int ret = -EINVAL;
enum net_loop_state prev_net_state = net_state;
net_restarted = 0;
net_dev_exists = 0;
@ -430,6 +431,7 @@ restart:
case 1:
/* network not configured */
eth_halt();
net_set_state(prev_net_state);
return -ENODEV;
case 2:
@ -655,6 +657,7 @@ done:
net_set_udp_handler(NULL);
net_set_icmp_handler(NULL);
#endif
net_set_state(prev_net_state);
return ret;
}