On 07/24/2014 02:16 PM, Martin Townsend wrote:
> Signed-off-by: Martin Townsend <martin.towns...@xsilon.com>
> ---
> net/ieee802154/reassembly.c | 13 +++----------
> 1 file changed, 3 insertions(+), 10 deletions(-)
>
> diff --git a/net/ieee802154/reassembly.c b/net/ieee802154/reassembly.c
> index b85bd3f..4122cdf 100644
> --- a/net/ieee802154/reassembly.c
> +++ b/net/ieee802154/reassembly.c
> @@ -370,8 +370,10 @@ int lowpan_frag_rcv(struct sk_buff *skb, const u8
> frag_type)
> if (err < 0)
> goto err;
>
> - if (frag_info->d_size > ieee802154_lowpan->max_dsize)
> + if (frag_info->d_size > IPV6_MIN_MTU) {
> + net_warn_ratelimited("lowpan_frag_rcv: datagram size exceeds
> MTU\n");
> goto err;
> + }
>
> inet_frag_evictor(&ieee802154_lowpan->frags, &lowpan_frags, false);
>
> @@ -416,13 +418,6 @@ static struct ctl_table lowpan_frags_ns_ctl_table[] = {
> .mode = 0644,
> .proc_handler = proc_dointvec_jiffies,
> },
> - {
> - .procname = "6lowpanfrag_max_datagram_size",
> - .data = &init_net.ieee802154_lowpan.max_dsize,
> - .maxlen = sizeof(int),
> - .mode = 0644,
> - .proc_handler = proc_dointvec
> - },
> { }
> };
>
> @@ -454,7 +449,6 @@ static int __net_init
> lowpan_frags_ns_sysctl_register(struct net *net)
> table[0].data = &ieee802154_lowpan->frags.high_thresh;
> table[1].data = &ieee802154_lowpan->frags.low_thresh;
> table[2].data = &ieee802154_lowpan->frags.timeout;
> - table[3].data = &ieee802154_lowpan->max_dsize;
>
> /* Don't export sysctls to unprivileged users */
> if (net->user_ns != &init_user_ns)
> @@ -529,7 +523,6 @@ static int __net_init lowpan_frags_init_net(struct net
> *net)
> ieee802154_lowpan->frags.high_thresh = IPV6_FRAG_HIGH_THRESH;
> ieee802154_lowpan->frags.low_thresh = IPV6_FRAG_LOW_THRESH;
> ieee802154_lowpan->frags.timeout = IPV6_FRAG_TIMEOUT;
> - ieee802154_lowpan->max_dsize = 0xFFFF;
>
> inet_frags_init_net(&ieee802154_lowpan->frags);
>
give proper commit whats this patch doing.. :-)
--
Regards,
Varka Bhadram.
------------------------------------------------------------------------------
Want fast and easy access to all the code in your enterprise? Index and
search up to 200,000 lines of code with a free copy of Black Duck
Code Sight - the same software that powers the world's largest code
search on Ohloh, the Black Duck Open Hub! Try it now.
http://p.sf.net/sfu/bds
_______________________________________________
Linux-zigbee-devel mailing list
Linux-zigbee-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-zigbee-devel
