diff options
| author | David S. Miller <davem@davemloft.net> | 2020-07-25 17:49:04 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-07-25 17:49:04 -0700 |
| commit | a57066b1a01977a646145f4ce8dfb4538b08368a (patch) | |
| tree | 57c2b4fa2fc48e687a1820b9bf4ef4f4363be0f9 /crypto | |
| parent | dfecd3e00cd32b2a6d1cfdb30b513dd42575ada3 (diff) | |
| parent | 04300d66f0a06d572d9f2ad6768c38cabde22179 (diff) | |
| download | linux-a57066b1a01977a646145f4ce8dfb4538b08368a.tar.gz linux-a57066b1a01977a646145f4ce8dfb4538b08368a.tar.bz2 linux-a57066b1a01977a646145f4ce8dfb4538b08368a.zip | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
The UDP reuseport conflict was a little bit tricky.
The net-next code, via bpf-next, extracted the reuseport handling
into a helper so that the BPF sk lookup code could invoke it.
At the same time, the logic for reuseport handling of unconnected
sockets changed via commit efc6b6f6c3113e8b203b9debfb72d81e0f3dcace
which changed the logic to carry on the reuseport result into the
rest of the lookup loop if we do not return immediately.
This requires moving the reuseport_has_conns() logic into the callers.
While we are here, get rid of inline directives as they do not belong
in foo.c files.
The other changes were cases of more straightforward overlapping
modifications.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/asymmetric_keys/public_key.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c index d7f43d4ea925..e5fae4e838c0 100644 --- a/crypto/asymmetric_keys/public_key.c +++ b/crypto/asymmetric_keys/public_key.c @@ -119,6 +119,7 @@ static int software_key_query(const struct kernel_pkey_params *params, if (IS_ERR(tfm)) return PTR_ERR(tfm); + ret = -ENOMEM; key = kmalloc(pkey->keylen + sizeof(u32) * 2 + pkey->paramlen, GFP_KERNEL); if (!key) |