All of lore.kernel.org
 help / color / mirror / Atom feed
From: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
To: gregkh@linuxfoundation.org
Cc: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>,
	dan.carpenter@oracle.com, devel@driverdev.osuosl.org,
	linux-kernel@vger.kernel.org
Subject: [PATCH v3 28/33] staging: rtl8192e: Replace ?: with max
Date: Sat,  9 May 2015 23:19:16 +0200	[thread overview]
Message-ID: <1431206361-13736-29-git-send-email-mateusz.kulikowski@gmail.com> (raw)
In-Reply-To: <1431206361-13736-1-git-send-email-mateusz.kulikowski@gmail.com>

Warninig is printed if precision is lost - it can't happen at moment as
all get_key implementations return either -1 or small buffers.

Signed-off-by: Mateusz Kulikowski <mateusz.kulikowski@gmail.com>
---
 drivers/staging/rtl8192e/rtllib_wx.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/drivers/staging/rtl8192e/rtllib_wx.c b/drivers/staging/rtl8192e/rtllib_wx.c
index 2ac1617..22bea5a 100644
--- a/drivers/staging/rtl8192e/rtllib_wx.c
+++ b/drivers/staging/rtl8192e/rtllib_wx.c
@@ -510,7 +510,10 @@ int rtllib_wx_get_encode(struct rtllib_device *ieee,
 		return 0;
 	}
 	len = crypt->ops->get_key(keybuf, SCM_KEY_LEN, NULL, crypt->priv);
-	erq->length = (len >= 0 ? len : 0);
+	if (len > U16_MAX)
+		netdev_err(ieee->dev, "Too long key returned.\n");
+
+	erq->length = max(len, 0);
 
 	erq->flags |= IW_ENCODE_ENABLED;
 
-- 
1.8.4.1


  parent reply	other threads:[~2015-05-09 21:22 UTC|newest]

Thread overview: 62+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-05-09 21:18 [PATCH v3 00/33] staging: rtl8192e: Fix more checkpatch.pl warnings Mateusz Kulikowski
2015-05-09 21:18 ` [PATCH v3 01/33] staging: rtl8192e: Declare ethernet addresses as __aligned(2) Mateusz Kulikowski
2015-05-09 22:29   ` Joe Perches
2015-05-12 19:44     ` Mateusz Kulikowski
2015-05-12 19:53       ` Joe Perches
2015-05-09 21:18 ` [PATCH v3 02/33] staging: rtl8192e: Fix PREFER_ETHER_ADDR_COPY warnings Mateusz Kulikowski
2015-05-10 13:19   ` Greg KH
2015-05-12 19:52     ` Mateusz Kulikowski
2015-05-12 21:19       ` Greg KH
2015-05-14 20:22         ` Mateusz Kulikowski
2015-05-09 21:18 ` [PATCH v3 03/33] staging: rtl8192e: Mark unaligned memcpy() Mateusz Kulikowski
2015-05-10 13:20   ` Greg KH
2015-05-12 20:05     ` Mateusz Kulikowski
2015-05-11  8:26   ` Dan Carpenter
2015-05-12 20:00     ` Mateusz Kulikowski
2015-05-13  8:22       ` Dan Carpenter
2015-05-14 20:29         ` Mateusz Kulikowski
2015-05-14 23:14           ` Dan Carpenter
2015-05-17 20:38             ` Mateusz Kulikowski
2015-05-18  9:09               ` Dan Carpenter
2015-05-09 21:18 ` [PATCH v3 04/33] staging: rtl8192e: Fix DEEP_INDENTATION warning in rtllib_parse_info_param() Mateusz Kulikowski
2015-05-10  7:49   ` Sudip Mukherjee
2015-05-12 21:01     ` Mateusz Kulikowski
2015-05-13  4:45       ` Sudip Mukherjee
2015-05-13  8:26       ` Dan Carpenter
2015-05-11 13:48   ` Dan Carpenter
2015-05-12 20:46     ` Mateusz Kulikowski
2015-05-09 21:18 ` [PATCH v3 05/33] staging: rtl8192e: Replace memcmp() with ether_addr_equal_unaligned() Mateusz Kulikowski
2015-05-09 21:18 ` [PATCH v3 06/33] staging: rtl8192e: Remove rtllib_crypt.[ch] Mateusz Kulikowski
2015-05-09 21:18 ` [PATCH v3 07/33] staging: rtl8192e: Replace RTLLIB_DEBUG(DL_ERR) with netdev_*() Mateusz Kulikowski
2015-05-10  7:53   ` Sudip Mukherjee
2015-05-12 20:43     ` Mateusz Kulikowski
2015-05-09 21:18 ` [PATCH v3 08/33] staging: rtl8192e: Remove RTLLIB_ERROR() and RTLLIB_WARNING() Mateusz Kulikowski
2015-05-09 21:18 ` [PATCH v3 09/33] staging: rtl8192e: Remove RTLLIB_DEBUG_WX() Mateusz Kulikowski
2015-05-09 21:18 ` [PATCH v3 10/33] staging: rtl8192e: Simplify rtllib_proces_probe_response() Mateusz Kulikowski
2015-05-09 21:18 ` [PATCH v3 11/33] staging: rtl8192e: Remove RTLLIB_DEBUG_SCAN() Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 12/33] staging: rtl8192e: Remove RTLLIB_DEBUG_(FRAG|EAP|DROP|STATE|TX|RX)() Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 13/33] staging: rtl8192e: Remove RTLLIB_DEBUG_QOS() Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 14/33] staging: rtl8192e: Remove RTLLIB_DEBUG_MGMT() Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 15/33] staging: rtl8192e: Remove RTLLIB_DEBUG_INFO() Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 16/33] staging: rtl8192e: Remove RTLLIB_DEBUG() Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 17/33] staging: rtl8192e: Remove RTLLIB_DEBUG_DATA() Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 18/33] staging: rtl8192e: Remove remains of RTLLIB_*_DEBUG() (including proc entry) Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 19/33] staging: rtl8192e: Remove assert() macro Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 20/33] staging: rtl8192e: Fix PREFER_PR_LEVEL warnings Mateusz Kulikowski
2015-05-09 22:37   ` Joe Perches
2015-05-12 20:20     ` Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 21/33] staging: rtl8192e: Fix LONG_LINE warnings Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 22/33] staging: rtl8192e: Fix LONG_LING in rtllib_parse_info_param() Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 23/33] staging: rtl8192e: Remove unimplemented iwpriv handlers Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 24/33] staging: rtl8192e: Fix OOM_MESSAGE warnings Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 25/33] staging: rtl8192e: Remove unused rtl_crypto.h Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 26/33] staging: rtl8192e: Replace ?: with max_t Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 27/33] staging: rtl8192e: Replace ?: with min_t Mateusz Kulikowski
2015-05-09 21:19 ` Mateusz Kulikowski [this message]
2015-05-11 13:22   ` [PATCH v3 28/33] staging: rtl8192e: Replace ?: with max Dan Carpenter
2015-05-12 20:08     ` Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 29/33] staging: rtl8192e: Remove unneeded RT_TRACE(COMP_ERR,...) Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 30/33] staging: rtl8192e: rtl8192_phy_checkBBAndRF(): Don't check MAC Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 31/33] staging: rtl8192e: Replace RT_TRACE(COMP_ERR, ...) with netdev_* Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 32/33] staging: rtl8192e: Fix trivial LONG_LINE errors Mateusz Kulikowski
2015-05-09 21:19 ` [PATCH v3 33/33] staging: rtl8192e: rtl8192E_suspend(): Fix WOL reporting Mateusz Kulikowski

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=1431206361-13736-29-git-send-email-mateusz.kulikowski@gmail.com \
    --to=mateusz.kulikowski@gmail.com \
    --cc=dan.carpenter@oracle.com \
    --cc=devel@driverdev.osuosl.org \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.