| Message ID | 20170818121651.516877-1-equinox@diac24.net |
|---|---|
| State | Changes Requested, archived |
| Delegated to: | David Miller |
| Headers | show |
Hello! On 08/18/2017 03:16 PM, David Lamparter wrote: > There is a new metadata dst type field added in "net: store > port/representator id in metadata_dst", but metadata_dst_free() wasn't > updated to check it before freeing the METADATA_IP_TUNNEL specific dst > cache entry. > > This is not currently causing problems since it's far enough back in the > struct to be zeroed for the only other type currently in existance > (METADATA_HW_PORT_MUX), but nevertheless it's not correct. > > Fixes: 3fcece12bc1b6dcdf0986f2cd9e8f63b1f9b6aa0 Please see Documentation/process/submitting-patches.rst on how this tag (and the commit citing in your description as well) should look like. > Signed-off-by: David Lamparter <equinox@diac24.net> > Cc: Jakub Kicinski <jakub.kicinski@netronome.com> > Cc: Sridhar Samudrala <sridhar.samudrala@intel.com> > Cc: Simon Horman <horms@verge.net.au> > Cc: David S. Miller <davem@davemloft.net> [...] MBR, Sergei
diff --git a/net/core/dst.c b/net/core/dst.c index 00aa972ad1a1..7954d1710d97 100644 --- a/net/core/dst.c +++ b/net/core/dst.c @@ -299,7 +299,8 @@ EXPORT_SYMBOL_GPL(metadata_dst_alloc); void metadata_dst_free(struct metadata_dst *md_dst) { #ifdef CONFIG_DST_CACHE - dst_cache_destroy(&md_dst->u.tun_info.dst_cache); + if (md_dst->type == METADATA_IP_TUNNEL) + dst_cache_destroy(&md_dst->u.tun_info.dst_cache); #endif kfree(md_dst); }
There is a new metadata dst type field added in "net: store port/representator id in metadata_dst", but metadata_dst_free() wasn't updated to check it before freeing the METADATA_IP_TUNNEL specific dst cache entry. This is not currently causing problems since it's far enough back in the struct to be zeroed for the only other type currently in existance (METADATA_HW_PORT_MUX), but nevertheless it's not correct. Fixes: 3fcece12bc1b6dcdf0986f2cd9e8f63b1f9b6aa0 Signed-off-by: David Lamparter <equinox@diac24.net> Cc: Jakub Kicinski <jakub.kicinski@netronome.com> Cc: Sridhar Samudrala <sridhar.samudrala@intel.com> Cc: Simon Horman <horms@verge.net.au> Cc: David S. Miller <davem@davemloft.net> --- net/core/dst.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-)