diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-05-18 15:02:27 -0700 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2022-05-18 15:02:27 -0700 |
| commit | 038c4bf85ba2bca715db3ca4d190de3e5299c6c3 (patch) | |
| tree | 087d4159caceecb334a322f5f1a3908d57159468 /net/key/af_key.c | |
| parent | c853246539f37936f20a38c12e55d54fe72f1c2a (diff) | |
| parent | d95bca4fbde0a29a3d987c39fd17e414f1ed5ec6 (diff) | |
| download | linux-038c4bf85ba2bca715db3ca4d190de3e5299c6c3.tar.gz linux-038c4bf85ba2bca715db3ca4d190de3e5299c6c3.tar.bz2 linux-038c4bf85ba2bca715db3ca4d190de3e5299c6c3.zip | |
Merge branch 'ib/5.17-cros-ec-keyb' into next
Merge changes to ChromeOS EC Keyboard driver.
Diffstat (limited to 'net/key/af_key.c')
| -rw-r--r-- | net/key/af_key.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/net/key/af_key.c b/net/key/af_key.c index 9bf52a09b5ff..fd51db3be91c 100644 --- a/net/key/af_key.c +++ b/net/key/af_key.c @@ -1699,7 +1699,7 @@ static int pfkey_register(struct sock *sk, struct sk_buff *skb, const struct sad xfrm_probe_algs(); - supp_skb = compose_sadb_supported(hdr, GFP_KERNEL); + supp_skb = compose_sadb_supported(hdr, GFP_KERNEL | __GFP_ZERO); if (!supp_skb) { if (hdr->sadb_msg_satype != SADB_SATYPE_UNSPEC) pfk->registered &= ~(1<<hdr->sadb_msg_satype); |