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

Commit bcbc7134 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6 

* git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6:
  bridge: don't allow setting hello time to zero
  netns : fix kernel panic in timewait socket destruction
  pkt_sched: Fix qdisc state in net_tx_action()
  netfilter: nf_conntrack_irc: make sure string is terminated before calling simple_strtoul
  netfilter: nf_conntrack_gre: nf_ct_gre_keymap_flush() fixlet
  netfilter: nf_conntrack_gre: more locking around keymap list
  netfilter: nf_conntrack_sip: de-static helper pointers
parents b364e2f5 8d4698f7

include/net/inet_timewait_sock.h

+3 −0
Original line number Original line Diff line number Diff line
@@ -208,6 +208,9 @@ extern void inet_twsk_schedule(struct inet_timewait_sock *tw, 
extern void inet_twsk_deschedule(struct inet_timewait_sock *tw,

extern void inet_twsk_deschedule(struct inet_timewait_sock *tw,

				 struct inet_timewait_death_row *twdr);

				 struct inet_timewait_death_row *twdr);





extern void inet_twsk_purge(struct net *net, struct inet_hashinfo *hashinfo,

			    struct inet_timewait_death_row *twdr, int family);



static inline

static inline

struct net *twsk_net(const struct inet_timewait_sock *twsk)

struct net *twsk_net(const struct inet_timewait_sock *twsk)

{

{

net/bridge/br_ioctl.c

+7 −1
Original line number Original line Diff line number Diff line
@@ -188,15 +188,21 @@ static int old_dev_ioctl(struct net_device *dev, struct ifreq *rq, int cmd) 
		return 0;

		return 0;





	case BRCTL_SET_BRIDGE_HELLO_TIME:

	case BRCTL_SET_BRIDGE_HELLO_TIME:

	{

		unsigned long t = clock_t_to_jiffies(args[1]);

		if (!capable(CAP_NET_ADMIN))

		if (!capable(CAP_NET_ADMIN))

			return -EPERM;

			return -EPERM;





		if (t < HZ)

			return -EINVAL;



		spin_lock_bh(&br->lock);

		spin_lock_bh(&br->lock);

		br->bridge_hello_time = clock_t_to_jiffies(args[1]);

		br->bridge_hello_time = t;

		if (br_is_root_bridge(br))

		if (br_is_root_bridge(br))

			br->hello_time = br->bridge_hello_time;

			br->hello_time = br->bridge_hello_time;

		spin_unlock_bh(&br->lock);

		spin_unlock_bh(&br->lock);

		return 0;

		return 0;

	}





	case BRCTL_SET_BRIDGE_MAX_AGE:

	case BRCTL_SET_BRIDGE_MAX_AGE:

		if (!capable(CAP_NET_ADMIN))

		if (!capable(CAP_NET_ADMIN))

net/bridge/br_sysfs_br.c

+18 −8
Original line number Original line Diff line number Diff line
@@ -29,11 +29,12 @@ 
 */

 */

static ssize_t store_bridge_parm(struct device *d,

static ssize_t store_bridge_parm(struct device *d,

				 const char *buf, size_t len,

				 const char *buf, size_t len,

				 void (*set)(struct net_bridge *, unsigned long))

				 int (*set)(struct net_bridge *, unsigned long))

{

{

	struct net_bridge *br = to_bridge(d);

	struct net_bridge *br = to_bridge(d);

	char *endp;

	char *endp;

	unsigned long val;

	unsigned long val;

	int err;





	if (!capable(CAP_NET_ADMIN))

	if (!capable(CAP_NET_ADMIN))

		return -EPERM;

		return -EPERM;
@@ -43,9 +44,9 @@ static ssize_t store_bridge_parm(struct device *d, 
		return -EINVAL;

		return -EINVAL;





	spin_lock_bh(&br->lock);

	spin_lock_bh(&br->lock);

	(*set)(br, val);

	err = (*set)(br, val);

	spin_unlock_bh(&br->lock);

	spin_unlock_bh(&br->lock);

	return len;

	return err ? err : len;

}

}
@@ -56,12 +57,13 @@ static ssize_t show_forward_delay(struct device *d, 
	return sprintf(buf, "%lu\n", jiffies_to_clock_t(br->forward_delay));

	return sprintf(buf, "%lu\n", jiffies_to_clock_t(br->forward_delay));

}

}





static void set_forward_delay(struct net_bridge *br, unsigned long val)

static int set_forward_delay(struct net_bridge *br, unsigned long val)

{

{

	unsigned long delay = clock_t_to_jiffies(val);

	unsigned long delay = clock_t_to_jiffies(val);

	br->forward_delay = delay;

	br->forward_delay = delay;

	if (br_is_root_bridge(br))

	if (br_is_root_bridge(br))

		br->bridge_forward_delay = delay;

		br->bridge_forward_delay = delay;

	return 0;

}

}





static ssize_t store_forward_delay(struct device *d,

static ssize_t store_forward_delay(struct device *d,
@@ -80,12 +82,17 @@ static ssize_t show_hello_time(struct device *d, struct device_attribute *attr, 
		       jiffies_to_clock_t(to_bridge(d)->hello_time));

		       jiffies_to_clock_t(to_bridge(d)->hello_time));

}

}





static void set_hello_time(struct net_bridge *br, unsigned long val)

static int set_hello_time(struct net_bridge *br, unsigned long val)

{

{

	unsigned long t = clock_t_to_jiffies(val);

	unsigned long t = clock_t_to_jiffies(val);



	if (t < HZ)

		return -EINVAL;



	br->hello_time = t;

	br->hello_time = t;

	if (br_is_root_bridge(br))

	if (br_is_root_bridge(br))

		br->bridge_hello_time = t;

		br->bridge_hello_time = t;

	return 0;

}

}





static ssize_t store_hello_time(struct device *d,

static ssize_t store_hello_time(struct device *d,
@@ -104,12 +111,13 @@ static ssize_t show_max_age(struct device *d, struct device_attribute *attr, 
		       jiffies_to_clock_t(to_bridge(d)->max_age));

		       jiffies_to_clock_t(to_bridge(d)->max_age));

}

}





static void set_max_age(struct net_bridge *br, unsigned long val)

static int set_max_age(struct net_bridge *br, unsigned long val)

{

{

	unsigned long t = clock_t_to_jiffies(val);

	unsigned long t = clock_t_to_jiffies(val);

	br->max_age = t;

	br->max_age = t;

	if (br_is_root_bridge(br))

	if (br_is_root_bridge(br))

		br->bridge_max_age = t;

		br->bridge_max_age = t;

	return 0;

}

}





static ssize_t store_max_age(struct device *d, struct device_attribute *attr,

static ssize_t store_max_age(struct device *d, struct device_attribute *attr,
@@ -126,9 +134,10 @@ static ssize_t show_ageing_time(struct device *d, 
	return sprintf(buf, "%lu\n", jiffies_to_clock_t(br->ageing_time));

	return sprintf(buf, "%lu\n", jiffies_to_clock_t(br->ageing_time));

}

}





static void set_ageing_time(struct net_bridge *br, unsigned long val)

static int set_ageing_time(struct net_bridge *br, unsigned long val)

{

{

	br->ageing_time = clock_t_to_jiffies(val);

	br->ageing_time = clock_t_to_jiffies(val);

	return 0;

}

}





static ssize_t store_ageing_time(struct device *d,

static ssize_t store_ageing_time(struct device *d,
@@ -180,9 +189,10 @@ static ssize_t show_priority(struct device *d, struct device_attribute *attr, 
		       (br->bridge_id.prio[0] << 8) | br->bridge_id.prio[1]);

		       (br->bridge_id.prio[0] << 8) | br->bridge_id.prio[1]);

}

}





static void set_priority(struct net_bridge *br, unsigned long val)

static int set_priority(struct net_bridge *br, unsigned long val)

{

{

	br_stp_set_bridge_priority(br, (u16) val);

	br_stp_set_bridge_priority(br, (u16) val);

	return 0;

}

}





static ssize_t store_priority(struct device *d, struct device_attribute *attr,

static ssize_t store_priority(struct device *d, struct device_attribute *attr,

net/core/dev.c

+6 −1
Original line number Original line Diff line number Diff line
@@ -1991,8 +1991,13 @@ static void net_tx_action(struct softirq_action *h) 
				spin_unlock(root_lock);

				spin_unlock(root_lock);

			} else {

			} else {

				if (!test_bit(__QDISC_STATE_DEACTIVATED,

				if (!test_bit(__QDISC_STATE_DEACTIVATED,

					      &q->state))

					      &q->state)) {

					__netif_reschedule(q);

					__netif_reschedule(q);

				} else {

					smp_mb__before_clear_bit();

					clear_bit(__QDISC_STATE_SCHED,

						  &q->state);

				}

			}

			}

		}

		}

	}

	}

net/ipv4/inet_timewait_sock.c

+35 −0
Original line number Original line Diff line number Diff line
@@ -409,3 +409,38 @@ void inet_twdr_twcal_tick(unsigned long data) 
}

}





EXPORT_SYMBOL_GPL(inet_twdr_twcal_tick);

EXPORT_SYMBOL_GPL(inet_twdr_twcal_tick);



void inet_twsk_purge(struct net *net, struct inet_hashinfo *hashinfo,

		     struct inet_timewait_death_row *twdr, int family)

{

	struct inet_timewait_sock *tw;

	struct sock *sk;

	struct hlist_node *node;

	int h;



	local_bh_disable();

	for (h = 0; h < (hashinfo->ehash_size); h++) {

		struct inet_ehash_bucket *head =

			inet_ehash_bucket(hashinfo, h);

		rwlock_t *lock = inet_ehash_lockp(hashinfo, h);

restart:

		write_lock(lock);

		sk_for_each(sk, node, &head->twchain) {



			tw = inet_twsk(sk);

			if (!net_eq(twsk_net(tw), net) ||

			    tw->tw_family != family)

				continue;



			atomic_inc(&tw->tw_refcnt);

			write_unlock(lock);

			inet_twsk_deschedule(tw, twdr);

			inet_twsk_put(tw);



			goto restart;

		}

		write_unlock(lock);

	}

	local_bh_enable();

}

EXPORT_SYMBOL_GPL(inet_twsk_purge);