From: Sven Eckelmann <sven@narfation.org>
To: b.a.t.m.a.n@lists.open-mesh.org
Subject: [B.A.T.M.A.N.] [PATCH 2/3] batman-adv: Check return value of try_module_get
Date: Mon, 20 Aug 2012 10:26:48 +0200 [thread overview]
Message-ID: <1345451209-8898-2-git-send-email-sven@narfation.org> (raw)
In-Reply-To: <1345451209-8898-1-git-send-email-sven@narfation.org>
New operations should not be started when they need an increased module
reference counter and try_module_get failed.
This patch addresses Coverity #712284: Unchecked return value
Signed-off-by: Sven Eckelmann <sven@narfation.org>
---
debugfs.c | 4 +++-
icmp_socket.c | 4 +++-
main.c | 4 ++--
main.h | 2 +-
4 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/debugfs.c b/debugfs.c
index 391d4fb..63152be 100644
--- a/debugfs.c
+++ b/debugfs.c
@@ -99,9 +99,11 @@ int batadv_debug_log(struct batadv_priv *bat_priv, const char *fmt, ...)
static int batadv_log_open(struct inode *inode, struct file *file)
{
+ if (!batadv_inc_module_count())
+ return -EBUSY;
+
nonseekable_open(inode, file);
file->private_data = inode->i_private;
- batadv_inc_module_count();
return 0;
}
diff --git a/icmp_socket.c b/icmp_socket.c
index bde3cf7..8c8d0b8 100644
--- a/icmp_socket.c
+++ b/icmp_socket.c
@@ -42,6 +42,9 @@ static int batadv_socket_open(struct inode *inode, struct file *file)
unsigned int i;
struct batadv_socket_client *socket_client;
+ if (!batadv_inc_module_count())
+ return -EBUSY;
+
nonseekable_open(inode, file);
socket_client = kmalloc(sizeof(*socket_client), GFP_KERNEL);
@@ -71,7 +74,6 @@ static int batadv_socket_open(struct inode *inode, struct file *file)
file->private_data = socket_client;
- batadv_inc_module_count();
return 0;
}
diff --git a/main.c b/main.c
index b4aa470..b4b5b89 100644
--- a/main.c
+++ b/main.c
@@ -160,9 +160,9 @@ void batadv_mesh_free(struct net_device *soft_iface)
atomic_set(&bat_priv->mesh_state, BATADV_MESH_INACTIVE);
}
-void batadv_inc_module_count(void)
+bool batadv_inc_module_count(void)
{
- try_module_get(THIS_MODULE);
+ return try_module_get(THIS_MODULE);
}
void batadv_dec_module_count(void)
diff --git a/main.h b/main.h
index f2227df..ded65b8 100644
--- a/main.h
+++ b/main.h
@@ -152,7 +152,7 @@ extern struct workqueue_struct *batadv_event_workqueue;
int batadv_mesh_init(struct net_device *soft_iface);
void batadv_mesh_free(struct net_device *soft_iface);
-void batadv_inc_module_count(void);
+bool batadv_inc_module_count(void);
void batadv_dec_module_count(void);
int batadv_is_my_mac(const uint8_t *addr);
int batadv_batman_skb_recv(struct sk_buff *skb, struct net_device *dev,
--
1.7.10.4
next prev parent reply other threads:[~2012-08-20 8:26 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-08-20 8:26 [B.A.T.M.A.N.] [PATCH 1/3] batman-adv: Remove extra check in batadv_bit_get_packet Sven Eckelmann
2012-08-20 8:26 ` Sven Eckelmann [this message]
2012-08-20 21:37 ` [B.A.T.M.A.N.] [PATCHv3 2/3] batman-adv: Check return value of try_module_get Sven Eckelmann
2012-08-24 22:08 ` Marek Lindner
2012-08-20 8:26 ` [B.A.T.M.A.N.] [PATCH 3/3] batman-adv: Only increase refcounter once for alternate router Sven Eckelmann
2012-08-24 22:19 ` Marek Lindner
2012-08-20 20:54 ` [B.A.T.M.A.N.] [PATCHv2 2/3] batman-adv: Check return value of try_module_get Sven Eckelmann
2012-08-24 21:59 ` [B.A.T.M.A.N.] [PATCH 1/3] batman-adv: Remove extra check in batadv_bit_get_packet 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=1345451209-8898-2-git-send-email-sven@narfation.org \
--to=sven@narfation.org \
--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