Metadata may be NULL for one of two reasons:
* Missing user input
* Failure to allocate the metadata dst

Disambiguate these case by returning -EINVAL for the former and -ENOMEM
for the latter rather than -EINVAL for both cases.

This is in preparation for using extended ack to provide more information
to users when parsing their input.

Signed-off-by: Simon Horman <simon.hor...@netronome.com>
Reviewed-by: Jakub Kicinski <jakub.kicin...@netronome.com>
---
 net/sched/act_tunnel_key.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net/sched/act_tunnel_key.c b/net/sched/act_tunnel_key.c
index 9169b7e78ada..7ce95538177b 100644
--- a/net/sched/act_tunnel_key.c
+++ b/net/sched/act_tunnel_key.c
@@ -143,10 +143,13 @@ static int tunnel_key_init(struct net *net, struct nlattr 
*nla,
                        metadata = __ipv6_tun_set_dst(&saddr, &daddr, 0, 0, 
dst_port,
                                                      0, flags,
                                                      key_id, 0);
+               } else {
+                       ret = -EINVAL;
+                       goto err_out;
                }
 
                if (!metadata) {
-                       ret = -EINVAL;
+                       ret = -ENOMEM;
                        goto err_out;
                }
 
-- 
2.11.0

Reply via email to