From: Marek Lindner <lindner_marek@yahoo.de>
To: b.a.t.m.a.n@lists.open-mesh.org
Cc: Marek Lindner <lindner_marek@yahoo.de>
Subject: [B.A.T.M.A.N.] [PATCH] batman-adv: fix cleanup in send_tt_request()
Date: Thu, 16 Jun 2011 12:37:07 +0200 [thread overview]
Message-ID: <1308220627-27164-1-git-send-email-lindner_marek@yahoo.de> (raw)
The ret variable was never set to any value other than 0, therefore
the skb and tt_req_node would not be freed in case of an error.
Furthermore, the code assumed tt_req_node being always a valid
pointer by dereferencing it in the cleanup part.
Signed-off-by: Marek Lindner <lindner_marek@yahoo.de>
---
translation-table.c | 9 +++++----
1 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/translation-table.c b/translation-table.c
index 373ee81..5f1fcd5 100644
--- a/translation-table.c
+++ b/translation-table.c
@@ -1012,12 +1012,12 @@ out:
int send_tt_request(struct bat_priv *bat_priv, struct orig_node *dst_orig_node,
uint8_t ttvn, uint16_t tt_crc, bool full_table)
{
- struct sk_buff *skb;
+ struct sk_buff *skb = NULL;
struct tt_query_packet *tt_request;
struct neigh_node *neigh_node = NULL;
struct hard_iface *primary_if;
- struct tt_req_node *tt_req_node;
- int ret = 0;
+ struct tt_req_node *tt_req_node = NULL;
+ int ret = 1;
primary_if = primary_if_get_selected(bat_priv);
if (!primary_if)
@@ -1066,8 +1066,9 @@ out:
neigh_node_free_ref(neigh_node);
if (primary_if)
hardif_free_ref(primary_if);
- if (ret) {
+ if (ret)
kfree_skb(skb);
+ if (ret && tt_req_node) {
spin_lock_bh(&bat_priv->tt_req_list_lock);
list_del(&tt_req_node->list);
spin_unlock_bh(&bat_priv->tt_req_list_lock);
--
1.7.5.3
next reply other threads:[~2011-06-16 10:37 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-06-16 10:37 Marek Lindner [this message]
2011-06-16 13:21 ` [B.A.T.M.A.N.] [PATCH] batman-adv: fix cleanup in send_tt_request() Antonio Quartulli
2011-06-17 5:55 ` Marek Lindner
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1308220627-27164-1-git-send-email-lindner_marek@yahoo.de \
--to=lindner_marek@yahoo.de \
--cc=b.a.t.m.a.n@lists.open-mesh.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).