diff options
| author |   Alexei Starovoitov <ast@plumgrid.com> | 2014-07-30 20:34:12 -0700 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2014-08-02 15:02:37 -0700 |
| commit | 278571baca2aecf5fb5cb5c8b002dbfa0a6c524c (patch) | |
| tree | 51ff4143d22b2e550308681c938afc7c9c10dcdc /net/core/sock.c | |
| parent | net: use inet6_iif instead of IP6CB()->iif (diff) | |
| download | linux-dev-278571baca2aecf5fb5cb5c8b002dbfa0a6c524c.tar.xz linux-dev-278571baca2aecf5fb5cb5c8b002dbfa0a6c524c.zip | |
net: filter: simplify socket charging
attaching bpf program to a socket involves multiple socket memory arithmetic,
since size of 'sk_filter' is changing when classic BPF is converted to eBPF.
Also common path of program creation has to deal with two ways of freeing
the memory.
Simplify the code by delaying socket charging until program is ready and
its size is known
Signed-off-by: Alexei Starovoitov <ast@plumgrid.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | net/core/sock.c | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/net/core/sock.c b/net/core/sock.c index 134291d73fcd..a741163568fa 100644 --- a/net/core/sock.c +++ b/net/core/sock.c @@ -1474,6 +1474,7 @@ static void sk_update_clone(const struct sock *sk, struct sock *newsk) struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority) { struct sock *newsk; + bool is_charged = true; newsk = sk_prot_alloc(sk->sk_prot, priority, sk->sk_family); if (newsk != NULL) { @@ -1518,9 +1519,13 @@ struct sock *sk_clone_lock(const struct sock *sk, const gfp_t priority) filter = rcu_dereference_protected(newsk->sk_filter, 1); if (filter != NULL) - sk_filter_charge(newsk, filter); + /* though it's an empty new sock, the charging may fail + * if sysctl_optmem_max was changed between creation of + * original socket and cloning + */ + is_charged = sk_filter_charge(newsk, filter); - if (unlikely(xfrm_sk_clone_policy(newsk))) { + if (unlikely(!is_charged || xfrm_sk_clone_policy(newsk))) { /* It is still raw copy of parent, so invalidate * destructor and make plain sk_free() */ newsk->sk_destruct = NULL; |