Commit 36b20b7f authored by Shannon Nelson's avatar Shannon Nelson Committed by David S. Miller

ionic: check for binary values in FW ver string

If the PCI connection is broken, reading the FW version string
will only get 0xff bytes, which shouldn't get printed.  This
checks the first byte and prints only the first 4 bytes
if non-ASCII.

Also, add a limit to the string length printed when a valid
string is found, just in case it is not properly terminated.
Signed-off-by: default avatarShannon Nelson <snelson@pensando.io>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ebc792e2
...@@ -7,6 +7,7 @@ ...@@ -7,6 +7,7 @@
#include <linux/netdevice.h> #include <linux/netdevice.h>
#include <linux/utsname.h> #include <linux/utsname.h>
#include <generated/utsrelease.h> #include <generated/utsrelease.h>
#include <linux/ctype.h>
#include "ionic.h" #include "ionic.h"
#include "ionic_bus.h" #include "ionic_bus.h"
...@@ -450,13 +451,23 @@ int ionic_identify(struct ionic *ionic) ...@@ -450,13 +451,23 @@ int ionic_identify(struct ionic *ionic)
} }
mutex_unlock(&ionic->dev_cmd_lock); mutex_unlock(&ionic->dev_cmd_lock);
dev_info(ionic->dev, "FW: %s\n", idev->dev_info.fw_version);
if (err) { if (err) {
dev_err(ionic->dev, "Cannot identify ionic: %dn", err); dev_err(ionic->dev, "Cannot identify ionic: %d\n", err);
goto err_out; goto err_out;
} }
if (isprint(idev->dev_info.fw_version[0]) &&
isascii(idev->dev_info.fw_version[0]))
dev_info(ionic->dev, "FW: %.*s\n",
(int)(sizeof(idev->dev_info.fw_version) - 1),
idev->dev_info.fw_version);
else
dev_info(ionic->dev, "FW: (invalid string) 0x%02x 0x%02x 0x%02x 0x%02x ...\n",
(u8)idev->dev_info.fw_version[0],
(u8)idev->dev_info.fw_version[1],
(u8)idev->dev_info.fw_version[2],
(u8)idev->dev_info.fw_version[3]);
err = ionic_lif_identify(ionic, IONIC_LIF_TYPE_CLASSIC, err = ionic_lif_identify(ionic, IONIC_LIF_TYPE_CLASSIC,
&ionic->ident.lif); &ionic->ident.lif);
if (err) { if (err) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment