]> git.baikalelectronics.ru Git - kernel.git/commitdiff
goldfish_pipe: use GFP_ATOMIC under spin lock
authorWei Yongjun <weiyongjun1@huawei.com>
Sun, 21 May 2017 00:45:46 +0000 (00:45 +0000)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 25 May 2017 16:26:11 +0000 (18:26 +0200)
The function get_free_pipe_id_locked() is called from
goldfish_pipe_open() with a lock is held, so we should
use GFP_ATOMIC instead of GFP_KERNEL.

Signed-off-by: Wei Yongjun <weiyongjun1@huawei.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/platform/goldfish/goldfish_pipe.c

index 2de1e603bd2b1d60afdf4261ce6b8c265c630d01..5f3672153b123b90bdfa4e93fd1fd8f7ec215546 100644 (file)
@@ -704,7 +704,7 @@ static int get_free_pipe_id_locked(struct goldfish_pipe_dev *dev)
                /* Reallocate the array */
                u32 new_capacity = 2 * dev->pipes_capacity;
                struct goldfish_pipe **pipes =
-                       kcalloc(new_capacity, sizeof(*pipes), GFP_KERNEL);
+                       kcalloc(new_capacity, sizeof(*pipes), GFP_ATOMIC);
                if (!pipes)
                        return -ENOMEM;
                memcpy(pipes, dev->pipes, sizeof(*pipes) * dev->pipes_capacity);