Commit 710ab6c0 authored by David S. Miller's avatar David S. Miller

ipv4: Enforce max MTU metric at route insertion time.

Rather than at every struct rtable creation.
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5943634f
...@@ -794,6 +794,8 @@ struct fib_info *fib_create_info(struct fib_config *cfg) ...@@ -794,6 +794,8 @@ struct fib_info *fib_create_info(struct fib_config *cfg)
val = nla_get_u32(nla); val = nla_get_u32(nla);
if (type == RTAX_ADVMSS && val > 65535 - 40) if (type == RTAX_ADVMSS && val > 65535 - 40)
val = 65535 - 40; val = 65535 - 40;
if (type == RTAX_MTU && val > 65535 - 15)
val = 65535 - 15;
fi->fib_metrics[type - 1] = val; fi->fib_metrics[type - 1] = val;
} }
} }
......
...@@ -1763,21 +1763,16 @@ static void rt_set_nexthop(struct rtable *rt, const struct flowi4 *fl4, ...@@ -1763,21 +1763,16 @@ static void rt_set_nexthop(struct rtable *rt, const struct flowi4 *fl4,
const struct fib_result *res, const struct fib_result *res,
struct fib_info *fi, u16 type, u32 itag) struct fib_info *fi, u16 type, u32 itag)
{ {
struct dst_entry *dst = &rt->dst;
if (fi) { if (fi) {
if (FIB_RES_GW(*res) && if (FIB_RES_GW(*res) &&
FIB_RES_NH(*res).nh_scope == RT_SCOPE_LINK) FIB_RES_NH(*res).nh_scope == RT_SCOPE_LINK)
rt->rt_gateway = FIB_RES_GW(*res); rt->rt_gateway = FIB_RES_GW(*res);
rt_init_metrics(rt, fl4, fi); rt_init_metrics(rt, fl4, fi);
#ifdef CONFIG_IP_ROUTE_CLASSID #ifdef CONFIG_IP_ROUTE_CLASSID
dst->tclassid = FIB_RES_NH(*res).nh_tclassid; rt->dst.tclassid = FIB_RES_NH(*res).nh_tclassid;
#endif #endif
} }
if (dst_mtu(dst) > IP_MAX_MTU)
dst_metric_set(dst, RTAX_MTU, IP_MAX_MTU);
#ifdef CONFIG_IP_ROUTE_CLASSID #ifdef CONFIG_IP_ROUTE_CLASSID
#ifdef CONFIG_IP_MULTIPLE_TABLES #ifdef CONFIG_IP_MULTIPLE_TABLES
set_class_tag(rt, fib_rules_tclass(res)); set_class_tag(rt, fib_rules_tclass(res));
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment