| From ben.hutchings@codethink.co.uk Thu Jul 5 18:24:02 2018 |
| From: Ben Hutchings <ben.hutchings@codethink.co.uk> |
| Date: Tue, 19 Jun 2018 18:47:52 +0100 |
| Subject: ipv4: Fix error return value in fib_convert_metrics() |
| To: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| Cc: stable@vger.kernel.org, Eric Dumazet <edumazet@google.com> |
| Message-ID: <20180619174752.tpvgu5pcvuzwac6c@xylophone.i.decadent.org.uk> |
| Content-Disposition: inline |
| |
| From: Ben Hutchings <ben.hutchings@codethink.co.uk> |
| |
| The validation code modified by commit 5b5e7a0de2bb ("net: metrics: |
| add proper netlink validation") is organised differently in older |
| kernel versions. The fib_convert_metrics() function that is modified |
| in the backports to 4.4 and 4.9 needs to returns an error code, not a |
| success flag. |
| |
| Signed-off-by: Ben Hutchings <ben.hutchings@codethink.co.uk> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> |
| --- |
| net/ipv4/fib_semantics.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/net/ipv4/fib_semantics.c |
| +++ b/net/ipv4/fib_semantics.c |
| @@ -980,7 +980,7 @@ fib_convert_metrics(struct fib_info *fi, |
| return -EINVAL; |
| } else { |
| if (nla_len(nla) != sizeof(u32)) |
| - return false; |
| + return -EINVAL; |
| val = nla_get_u32(nla); |
| } |
| if (type == RTAX_ADVMSS && val > 65535 - 40) |
