diff options
| author | Antonio Quartulli <antonio@meshcoding.com> | 2013-10-19 16:06:05 +0400 |
|---|---|---|
| committer | Antonio Quartulli <antonio@meshcoding.com> | 2013-10-19 16:46:32 +0400 |
| commit | 33faa04547d7ab51700bdc3fe9b6306d93dea43f (patch) | |
| tree | 0535b314d844010a631c02ca79295d2ef5f95e75 | |
| parent | b1eda2ac3fa6bf23b27c7c70eda6885124c79ed3 (diff) | |
| download | linux-33faa04547d7ab51700bdc3fe9b6306d93dea43f.tar.xz | |
batman-adv: check skb preparation return value
Fix bogus merge conflict resolution by checking the return
values of the skb preparation routines.
Signed-off-by: Antonio Quartulli <antonio@meshcoding.com>
| -rw-r--r-- | net/batman-adv/send.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/net/batman-adv/send.c b/net/batman-adv/send.c index 82588e425641..d765d53f8201 100644 --- a/net/batman-adv/send.c +++ b/net/batman-adv/send.c @@ -267,11 +267,14 @@ int batadv_send_skb_generic_unicast(struct batadv_priv *bat_priv, switch (packet_type) { case BATADV_UNICAST: - batadv_send_skb_prepare_unicast(skb, orig_node); + if (!batadv_send_skb_prepare_unicast(skb, orig_node)) + goto out; break; case BATADV_UNICAST_4ADDR: - batadv_send_skb_prepare_unicast_4addr(bat_priv, skb, orig_node, - packet_subtype); + if (!batadv_send_skb_prepare_unicast_4addr(bat_priv, skb, + orig_node, + packet_subtype)) + goto out; break; default: /* this function supports UNICAST and UNICAST_4ADDR only. It |