linux-kernel - [PATCH v3 5/8] staging: rtl8192e: Fix unbalanced braces

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1489571517-3332-6-git-send-email-sunil.m@techveda.org>
Date:   Wed, 15 Mar 2017 15:21:54 +0530
From:   sunil.m@...hveda.org
To:     gregkh@...uxfoundation.org, dan.carpenter@...cle.com
Cc:     devel@...verdev.osuosl.org, linux-kernel@...r.kernel.org,
        karthiknishu@...oo.com, Suniel Mahesh <sunil.m@...hveda.org>
Subject: [PATCH v3 5/8] staging: rtl8192e: Fix unbalanced braces

From: Suniel Mahesh <sunil.m@...hveda.org>

Fixed unbalanced braces around else statement
Add braces on all arms of the if-else statements to comply with
kernel coding style.

Signed-off-by: Suniel Mahesh <sunil.m@...hveda.org>
---
Changes for v3:

- Split earlier patches into multiple commits for easy review
  as suggested by Greg K-H
- Modified subject and description for better readability
- Rebased on top of next-20170310
- Patches were tested and built on next-20170310 and staging-testing
  as suggested by Greg K-H, no errors reported

Changes for v2:

- new patch addition to the series
- Rebased on top of next-20170306
---
 drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 30 +++++++++++++++++-----------
 1 file changed, 18 insertions(+), 12 deletions(-)

diff --git a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
index 0fa4017..c355ee7 100644
--- a/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
+++ b/drivers/staging/rtl8192e/rtl8192e/rtl_core.c
@@ -2294,17 +2294,20 @@ static int _rtl92e_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 
 		if (ipw->cmd == IEEE_CMD_SET_ENCRYPTION) {
 			if (ipw->u.crypt.set_tx) {
-				if (strcmp(ipw->u.crypt.alg, "CCMP") == 0)
+				if (strcmp(ipw->u.crypt.alg, "CCMP") == 0) {
 					ieee->pairwise_key_type = KEY_TYPE_CCMP;
-				else if (strcmp(ipw->u.crypt.alg, "TKIP") == 0)
+				} else if (strcmp(ipw->u.crypt.alg,
+								"TKIP") == 0) {
 					ieee->pairwise_key_type = KEY_TYPE_TKIP;
-				else if (strcmp(ipw->u.crypt.alg, "WEP") == 0) {
-					if (ipw->u.crypt.key_len == 13)
+				} else if (strcmp(ipw->u.crypt.alg,
+								"WEP") == 0) {
+					if (ipw->u.crypt.key_len == 13) {
 						ieee->pairwise_key_type =
 							 KEY_TYPE_WEP104;
-					else if (ipw->u.crypt.key_len == 5)
+					} else if (ipw->u.crypt.key_len == 5) {
 						ieee->pairwise_key_type =
 							 KEY_TYPE_WEP40;
+					}
 				} else {
 					ieee->pairwise_key_type = KEY_TYPE_NA;
 				}
@@ -2346,20 +2349,23 @@ static int _rtl92e_ioctl(struct net_device *dev, struct ifreq *rq, int cmd)
 
 			} else {
 				memcpy((u8 *)key, ipw->u.crypt.key, 16);
-				if (strcmp(ipw->u.crypt.alg, "CCMP") == 0)
+				if (strcmp(ipw->u.crypt.alg, "CCMP") == 0) {
 					ieee->group_key_type = KEY_TYPE_CCMP;
-				else if (strcmp(ipw->u.crypt.alg, "TKIP") == 0)
+				} else if (strcmp(ipw->u.crypt.alg,
+								"TKIP") == 0) {
 					ieee->group_key_type = KEY_TYPE_TKIP;
-				else if (strcmp(ipw->u.crypt.alg, "WEP") == 0) {
-					if (ipw->u.crypt.key_len == 13)
+				} else if (strcmp(ipw->u.crypt.alg,
+								"WEP") == 0) {
+					if (ipw->u.crypt.key_len == 13) {
 						ieee->group_key_type =
 							 KEY_TYPE_WEP104;
-					else if (ipw->u.crypt.key_len == 5)
+					} else if (ipw->u.crypt.key_len == 5) {
 						ieee->group_key_type =
 							 KEY_TYPE_WEP40;
-				} else
+					}
+				} else {
 					ieee->group_key_type = KEY_TYPE_NA;
-
+				}
 				if (ieee->group_key_type) {
 					rtl92e_set_swcam(dev, ipw->u.crypt.idx,
 							 ipw->u.crypt.idx,
-- 
1.9.1