Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b8f55831 authored by Milan Kocian's avatar Milan Kocian Committed by David S. Miller
Browse files

[RTNETLINK]: Fix sending netlink message when replace route. 

When you replace route via ip r r command the netlink multicast message is
not send.  This patch corrects it.  NL message is sent with NLM_F_REPLACE
flag.

Addresses http://bugzilla.kernel.org/show_bug.cgi?id=8320



Signed-off-by: default avatarMilan Kocian <milon@wq.cz>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 8a903be1

net/ipv4/fib_hash.c

+4 −2
Original line number Diff line number Diff line
@@ -456,6 +456,8 @@ static int fn_hash_insert(struct fib_table *tb, struct fib_config *cfg) 
			fib_release_info(fi_drop);

			if (state & FA_S_ACCESSED)

				rt_cache_flush(-1);

			rtmsg_fib(RTM_NEWROUTE, key, fa, cfg->fc_dst_len, tb->tb_id,

				  &cfg->fc_nlinfo, NLM_F_REPLACE);

			return 0;

		}
@@ -523,7 +525,7 @@ static int fn_hash_insert(struct fib_table *tb, struct fib_config *cfg) 
	rt_cache_flush(-1);



	rtmsg_fib(RTM_NEWROUTE, key, new_fa, cfg->fc_dst_len, tb->tb_id,

		  &cfg->fc_nlinfo);

		  &cfg->fc_nlinfo, 0);

	return 0;



out_free_new_fa:
@@ -589,7 +591,7 @@ static int fn_hash_delete(struct fib_table *tb, struct fib_config *cfg) 


		fa = fa_to_delete;

		rtmsg_fib(RTM_DELROUTE, key, fa, cfg->fc_dst_len,

			  tb->tb_id, &cfg->fc_nlinfo);

			  tb->tb_id, &cfg->fc_nlinfo, 0);



		kill_fn = 0;

		write_lock_bh(&fib_hash_lock);

net/ipv4/fib_lookup.h

+2 −1
Original line number Diff line number Diff line
@@ -30,7 +30,8 @@ extern int fib_dump_info(struct sk_buff *skb, u32 pid, u32 seq, int event, 
			 int dst_len, u8 tos, struct fib_info *fi,

			 unsigned int);

extern void rtmsg_fib(int event, __be32 key, struct fib_alias *fa,

		      int dst_len, u32 tb_id, struct nl_info *info);

		      int dst_len, u32 tb_id, struct nl_info *info,

		      unsigned int nlm_flags);

extern struct fib_alias *fib_find_alias(struct list_head *fah,

					u8 tos, u32 prio);

extern int fib_detect_death(struct fib_info *fi, int order,

net/ipv4/fib_semantics.c

+3 −2
Original line number Diff line number Diff line
@@ -301,7 +301,8 @@ static inline size_t fib_nlmsg_size(struct fib_info *fi) 
}



void rtmsg_fib(int event, __be32 key, struct fib_alias *fa,

	       int dst_len, u32 tb_id, struct nl_info *info)

	       int dst_len, u32 tb_id, struct nl_info *info,

	       unsigned int nlm_flags)

{

	struct sk_buff *skb;

	u32 seq = info->nlh ? info->nlh->nlmsg_seq : 0;
@@ -313,7 +314,7 @@ void rtmsg_fib(int event, __be32 key, struct fib_alias *fa, 


	err = fib_dump_info(skb, info->pid, seq, event, tb_id,

			    fa->fa_type, fa->fa_scope, key, dst_len,

			    fa->fa_tos, fa->fa_info, 0);

			    fa->fa_tos, fa->fa_info, nlm_flags);

	if (err < 0) {

		/* -EMSGSIZE implies BUG in fib_nlmsg_size() */

		WARN_ON(err == -EMSGSIZE);

net/ipv4/fib_trie.c

+4 −2
Original line number Diff line number Diff line
@@ -1226,6 +1226,8 @@ static int fn_trie_insert(struct fib_table *tb, struct fib_config *cfg) 
			fib_release_info(fi_drop);

			if (state & FA_S_ACCESSED)

				rt_cache_flush(-1);

			rtmsg_fib(RTM_NEWROUTE, htonl(key), new_fa, plen,

				tb->tb_id, &cfg->fc_nlinfo, NLM_F_REPLACE);



			goto succeeded;

		}
@@ -1278,7 +1280,7 @@ static int fn_trie_insert(struct fib_table *tb, struct fib_config *cfg) 


	rt_cache_flush(-1);

	rtmsg_fib(RTM_NEWROUTE, htonl(key), new_fa, plen, tb->tb_id,

		  &cfg->fc_nlinfo);

		  &cfg->fc_nlinfo, 0);

succeeded:

	return 0;
@@ -1624,7 +1626,7 @@ static int fn_trie_delete(struct fib_table *tb, struct fib_config *cfg) 


	fa = fa_to_delete;

	rtmsg_fib(RTM_DELROUTE, htonl(key), fa, plen, tb->tb_id,

		  &cfg->fc_nlinfo);

		  &cfg->fc_nlinfo, 0);



	l = fib_find_node(t, key);

	li = find_leaf_info(l, plen);