]> git.proxmox.com Git - mirror_ubuntu-hirsute-kernel.git/commitdiff
s390/ctcm: Use explicit allocation mask in ctcmpc_unpack_skb().
authorSebastian Andrzej Siewior <bigeasy@linutronix.de>
Mon, 30 Nov 2020 10:09:48 +0000 (11:09 +0100)
committerJakub Kicinski <kuba@kernel.org>
Wed, 2 Dec 2020 00:56:01 +0000 (16:56 -0800)
gfp_type() uses in_interrupt() to figure out the correct GFP mask.

The usage of in_interrupt() in drivers is phased out and Linus clearly
requested that code which changes behaviour depending on context should
either be separated or the context be conveyed in an argument passed by the
caller, which usually knows the context.

The call chain of ctcmpc_unpack_skb():
ctcmpc_bh()
 -> ctcmpc_unpack_skb()

ctcmpc_bh() is a tasklet handler so GFP_ATOMIC is needed.

Use GFP_ATOMIC as allocation type in ctcmpc_unpack_skb().

Reviewed-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Julian Wiedmann <jwi@linux.ibm.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
drivers/s390/net/ctcm_mpc.c

index 8ae49732d1d2092f01be27e06416efe671f435f6..19ee91acb89d9539c8e69ed0882ca59ce8c6a801 100644 (file)
@@ -1163,7 +1163,7 @@ static void ctcmpc_unpack_skb(struct channel *ch, struct sk_buff *pskb)
                        skb_pull(pskb, new_len); /* point to next PDU */
                }
        } else {
-               mpcginfo = kmalloc(sizeof(struct mpcg_info), gfp_type());
+               mpcginfo = kmalloc(sizeof(struct mpcg_info), GFP_ATOMIC);
                if (mpcginfo == NULL)
                                        goto done;