net: hsr: fix NULL checks in the code (05ca6e64) · Commits · 戴 / test

net/hsr/hsr_device.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -258,7 +258,7 @@ static void send_hsr_supervision_frame(struct hsr_port *master,
		sizeof(struct hsr_sup_tag) +
		sizeof(struct hsr_sup_payload) + hlen + tlen);

		if (skb == NULL)
		if (!skb)
		return;

		skb_reserve(skb, hlen);

net/hsr/hsr_forward.c

+6 −6

Original line number	Diff line number	Diff line
		@@ -97,7 +97,7 @@ static struct sk_buff create_stripped_skb(struct sk_buff skb_in,
		skb_pull(skb_in, HSR_HLEN);
		skb = __pskb_copy(skb_in, skb_headroom(skb_in) - HSR_HLEN, GFP_ATOMIC);
		skb_push(skb_in, HSR_HLEN);
		if (skb == NULL)
		if (!skb)
		return NULL;

		skb_reset_mac_header(skb);
		@@ -160,7 +160,7 @@ static struct sk_buff create_tagged_skb(struct sk_buff skb_o,

		/* Create the new skb with enough headroom to fit the HSR tag */
		skb = __pskb_copy(skb_o, skb_headroom(skb_o) + HSR_HLEN, GFP_ATOMIC);
		if (skb == NULL)
		if (!skb)
		return NULL;
		skb_reset_mac_header(skb);

		@@ -277,7 +277,7 @@ static void hsr_forward_do(struct hsr_frame_info *frame)
		skb = frame_get_tagged_skb(frame, port);
		else
		skb = frame_get_stripped_skb(frame, port);
		if (skb == NULL) {
		if (!skb) {
		/* FIXME: Record the dropped frame? */
		continue;
		}
		@@ -317,7 +317,7 @@ static int hsr_fill_frame_info(struct hsr_frame_info *frame,

		frame->is_supervision = is_supervision_frame(port->hsr, skb);
		frame->node_src = hsr_get_node(port, skb, frame->is_supervision);
		if (frame->node_src == NULL)
		if (!frame->node_src)
		return -1; /* Unknown node and !is_supervision, or no mem */

		ethhdr = (struct ethhdr *) skb_mac_header(skb);
		@@ -364,9 +364,9 @@ void hsr_forward_skb(struct sk_buff skb, struct hsr_port port)
		hsr_register_frame_in(frame.node_src, port, frame.sequence_nr);
		hsr_forward_do(&frame);

		if (frame.skb_hsr != NULL)
		if (frame.skb_hsr)
		kfree_skb(frame.skb_hsr);
		if (frame.skb_std != NULL)
		if (frame.skb_std)
		kfree_skb(frame.skb_std);
		return;

net/hsr/hsr_framereg.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -405,7 +405,7 @@ void hsr_prune_nodes(struct timer_list *t)
		msecs_to_jiffies(1.5*MAX_SLAVE_DIFF))) {
		rcu_read_lock();
		port = get_late_port(hsr, node);
		if (port != NULL)
		if (port)
		hsr_nl_ringerror(hsr, node->MacAddressA, port);
		rcu_read_unlock();
		}

net/hsr/hsr_main.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -30,12 +30,12 @@ static int hsr_netdev_notify(struct notifier_block *nb, unsigned long event,

		dev = netdev_notifier_info_to_dev(ptr);
		port = hsr_port_get_rtnl(dev);
		if (port == NULL) {
		if (!port) {
		if (!is_hsr_master(dev))
		return NOTIFY_DONE; /* Not an HSR device */
		hsr = netdev_priv(dev);
		port = hsr_port_get_hsr(hsr, HSR_PT_MASTER);
		if (port == NULL) {
		if (!port) {
		/* Resend of notification concerning removed device? */
		return NOTIFY_DONE;
		}

net/hsr/hsr_slave.c

+3 −3

Original line number	Diff line number	Diff line
		@@ -140,11 +140,11 @@ int hsr_add_port(struct hsr_priv hsr, struct net_device dev,
		}

		port = hsr_port_get_hsr(hsr, type);
		if (port != NULL)
		if (port)
		return -EBUSY; /* This port already exists */

		port = kzalloc(sizeof(*port), GFP_KERNEL);
		if (port == NULL)
		if (!port)
		return -ENOMEM;

		if (type != HSR_PT_MASTER) {
		@@ -181,7 +181,7 @@ void hsr_del_port(struct hsr_port *port)
		list_del_rcu(&port->port_list);

		if (port != master) {
		if (master != NULL) {
		if (master) {
		netdev_update_features(master->dev);
		dev_set_mtu(master->dev, hsr_get_max_mtu(hsr));
		}

Admin message