Skip to contentSkip to conversation

staging: speakup: Replace BUG_ON() with WARN_ON().

PATCH In review Varsha Rao 2 participants 2 messages Feb 25, 2017 Staging

lore
Share & tools
lore

Varsha Rao

author
#0 lore raw

PATCH v3 1/1 staging: speakup: Replace BUG_ON() with WARN_ON().

BUG_ON() is replaced with WARN_ON() and EINVAL is returned, when WARN_ON() is true. This fixes the following checkpatch issue:

Avoid crashing the kernel - try using WARN_ON & recovery code rather than BUG() or BUG_ON().

---
Changes in v3:
- Modified commit message.
- Added if condition to avoid dereferencing a NULL pointer.
- Added return statement, which returns EINVAL.

 drivers/staging/speakup/kobjects.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/staging/speakup/kobjects.c +6 -2
index 4ea441d..5d871ec 100644
@@ -833,7 +833,9 @@ static ssize_t message_show(struct kobject *kobj,
 	struct msg_group_t *group = spk_find_msg_group(attr->attr.name);
 	unsigned long flags;
 
-	BUG_ON(!group);
+	if (WARN_ON(!group))
+		return -EINVAL;
+
 	spin_lock_irqsave(&speakup_info.spinlock, flags);
 	retval = message_show_helper(buf, group->start, group->end);
 	spin_unlock_irqrestore(&speakup_info.spinlock, flags);
@@ -845,7 +847,9 @@ static ssize_t message_store(struct kobject *kobj, struct kobj_attribute *attr,
 {
 	struct msg_group_t *group = spk_find_msg_group(attr->attr.name);
 
-	BUG_ON(!group);
+	if (WARN_ON(!group))
+		return -EINVAL;
+
 	return message_store_helper(buf, count, group);
 }
 
Signature · 1 line
2.9.3
Reviewed-by on v3 1/1
#1 lore raw
Quoted 7 lines · Varsha Rao, on sam. 25 f�vr. 2017 17:53:58 +0530, wrote:

BUG_ON() is replaced with WARN_ON() and EINVAL is returned, when WARN_ON() is true. This fixes the following checkpatch issue:

Avoid crashing the kernel - try using WARN_ON & recovery code rather than BUG() or BUG_ON().

Quoted 34 lines

---
Changes in v3:
- Modified commit message.
- Added if condition to avoid dereferencing a NULL pointer.
- Added return statement, which returns EINVAL.

 drivers/staging/speakup/kobjects.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)
drivers/staging/speakup/kobjects.c +6 -2
index 4ea441d..5d871ec 100644
@@ -833,7 +833,9 @@ static ssize_t message_show(struct kobject *kobj,
 	struct msg_group_t *group = spk_find_msg_group(attr->attr.name);
 	unsigned long flags;
 
-	BUG_ON(!group);
+	if (WARN_ON(!group))
+		return -EINVAL;
+
 	spin_lock_irqsave(&speakup_info.spinlock, flags);
 	retval = message_show_helper(buf, group->start, group->end);
 	spin_unlock_irqrestore(&speakup_info.spinlock, flags);
@@ -845,7 +847,9 @@ static ssize_t message_store(struct kobject *kobj, struct kobj_attribute *attr,
 {
 	struct msg_group_t *group = spk_find_msg_group(attr->attr.name);
 
-	BUG_ON(!group);
+	if (WARN_ON(!group))
+		return -EINVAL;
+
 	return message_store_helper(buf, count, group);
 }