diff options
| author |   Jia-Ju Bai <baijiaju1990@163.com> | 2017-05-31 09:40:11 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2017-05-31 14:38:10 -0400 |
| commit | e8f4ae85439f34bec3b0ab69223a41809dab28c9 (patch) | |
| tree | 06a335def58c9f7583e4ea9c45005abbdbf97e83 /drivers/isdn | |
| parent | net: freescale: fix potential null pointer dereference (diff) | |
| download | linux-dev-e8f4ae85439f34bec3b0ab69223a41809dab28c9.tar.xz linux-dev-e8f4ae85439f34bec3b0ab69223a41809dab28c9.zip | |
isdn: Fix a sleep-in-atomic bug
The driver may sleep under a spin lock, the function call path is:
isdn_ppp_mp_receive (acquire the lock)
isdn_ppp_mp_reassembly
isdn_ppp_push_higher
isdn_ppp_decompress
isdn_ppp_ccp_reset_trans
isdn_ppp_ccp_reset_alloc_state
kzalloc(GFP_KERNEL) --> may sleep
To fixed it, the "GFP_KERNEL" is replaced with "GFP_ATOMIC".
Signed-off-by: Jia-Ju Bai <baijiaju1990@163.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/isdn')
| -rw-r--r-- | drivers/isdn/i4l/isdn_ppp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/isdn/i4l/isdn_ppp.c b/drivers/isdn/i4l/isdn_ppp.c index d07dd5196ffc..8aa158a09180 100644 --- a/drivers/isdn/i4l/isdn_ppp.c +++ b/drivers/isdn/i4l/isdn_ppp.c @@ -2364,7 +2364,7 @@ static struct ippp_ccp_reset_state *isdn_ppp_ccp_reset_alloc_state(struct ippp_s id); return NULL; } else { - rs = kzalloc(sizeof(struct ippp_ccp_reset_state), GFP_KERNEL); + rs = kzalloc(sizeof(struct ippp_ccp_reset_state), GFP_ATOMIC); if (!rs) return NULL; rs->state = CCPResetIdle; |