diff options
| author | Paolo Abeni <pabeni@redhat.com> | 2023-09-21 21:49:45 +0200 |
|---|---|---|
| committer | Paolo Abeni <pabeni@redhat.com> | 2023-09-21 21:49:45 +0200 |
| commit | e9cbc89067cce78211c8629c78e931c0fe64e29d (patch) | |
| tree | 95662373d0a7b4adc589fec61e120586d476de71 /drivers/net/ethernet/sfc/tc_encap_actions.c | |
| parent | f30e5323a188cfc2d74b04f222cea0dbe9ffd6e6 (diff) | |
| parent | 27bbf45eae9ca98877a2d52a92a188147cd61b07 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net
Cross-merge networking fixes after downstream PR.
No conflicts.
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
Diffstat (limited to 'drivers/net/ethernet/sfc/tc_encap_actions.c')
| -rw-r--r-- | drivers/net/ethernet/sfc/tc_encap_actions.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/drivers/net/ethernet/sfc/tc_encap_actions.c b/drivers/net/ethernet/sfc/tc_encap_actions.c index 7e8bcdb222ad..87443f9dfd22 100644 --- a/drivers/net/ethernet/sfc/tc_encap_actions.c +++ b/drivers/net/ethernet/sfc/tc_encap_actions.c @@ -132,6 +132,8 @@ static int efx_bind_neigh(struct efx_nic *efx, /* don't need our new entry */ put_net_track(neigh->net, &neigh->ns_tracker); kfree(neigh); + if (IS_ERR(old)) /* oh dear, it's actually an error */ + return PTR_ERR(old); if (!refcount_inc_not_zero(&old->ref)) return -EAGAIN; /* existing entry found, ref taken */ @@ -640,6 +642,8 @@ struct efx_tc_encap_action *efx_tc_flower_create_encap_md( if (old) { /* don't need our new entry */ kfree(encap); + if (IS_ERR(old)) /* oh dear, it's actually an error */ + return ERR_CAST(old); if (!refcount_inc_not_zero(&old->ref)) return ERR_PTR(-EAGAIN); /* existing entry found, ref taken */ |