Skip to content

Commit

Permalink
ax25: use GFP_KERNEL in ax25_dev_device_up()
Browse files Browse the repository at this point in the history
ax25_dev_device_up() is only called during device setup, which is
done in user context. In addition, ax25_dev_device_up()
unconditionally calls ax25_register_dev_sysctl(), which already
allocates with GFP_KERNEL.

Since it is allowed to sleep in this function, here we change
ax25_dev_device_up() to use GFP_KERNEL to reduce unnecessary
out-of-memory errors.

Reported-by: Dan Carpenter <[email protected]>
Signed-off-by: Peter Lafreniere <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Signed-off-by: Jakub Kicinski <[email protected]>
  • Loading branch information
n8pjl authored and kuba-moo committed Jun 18, 2022
1 parent f691b4d commit f062334
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions net/ax25/ax25_dev.c
Original file line number Diff line number Diff line change
Expand Up @@ -52,15 +52,16 @@ void ax25_dev_device_up(struct net_device *dev)
{
ax25_dev *ax25_dev;

if ((ax25_dev = kzalloc(sizeof(*ax25_dev), GFP_ATOMIC)) == NULL) {
ax25_dev = kzalloc(sizeof(*ax25_dev), GFP_KERNEL);
if (!ax25_dev) {
printk(KERN_ERR "AX.25: ax25_dev_device_up - out of memory\n");
return;
}

refcount_set(&ax25_dev->refcount, 1);
dev->ax25_ptr = ax25_dev;
ax25_dev->dev = dev;
netdev_hold(dev, &ax25_dev->dev_tracker, GFP_ATOMIC);
netdev_hold(dev, &ax25_dev->dev_tracker, GFP_KERNEL);
ax25_dev->forward = NULL;
ax25_dev->device_up = true;

Expand Down

0 comments on commit f062334

Please sign in to comment.