s390/qeth: Convert sprintf/snprintf to scnprintf

This LWN article explains the rationale for this change
https: //lwn.net/Articles/69419/
Ie. snprintf() returns what *would* be the resulting length,
while scnprintf() returns the actual length.

Reported-by: Jules Irenge <jbi.octave@gmail.com>
Reviewed-by: Alexandra Winter <wintera@linux.ibm.com>
Signed-off-by: Thorsten Winkler <twinkler@linux.ibm.com>
Signed-off-by: Alexandra Winter <wintera@linux.ibm.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/s390/net/qeth_core_main.c b/drivers/s390/net/qeth_core_main.c
index 8bd9fd51208c92604599431b9294a3a8d1e7ac04..1d5b207c2b9e97148e4aa31a8bd9938552004cba 100644 (file)
--- a/drivers/s390/net/qeth_core_main.c
+++ b/drivers/s390/net/qeth_core_main.c
@@ -2801,9 +2801,11 @@ static void qeth_print_status_message(struct qeth_card *card)
                 * of the level OSA sets the first character to zero
                 * */
                if (!card->info.mcl_level[0]) {
-                       sprintf(card->info.mcl_level, "%02x%02x",
-                               card->info.mcl_level[2],
-                               card->info.mcl_level[3]);
+                       scnprintf(card->info.mcl_level,
+                                 sizeof(card->info.mcl_level),
+                                 "%02x%02x",
+                                 card->info.mcl_level[2],
+                                 card->info.mcl_level[3]);
                        break;
                }
                fallthrough;
@@ -6090,7 +6092,7 @@ void qeth_dbf_longtext(debug_info_t *id, int level, char *fmt, ...)
        if (!debug_level_enabled(id, level))
                return;
        va_start(args, fmt);
-       vsnprintf(dbf_txt_buf, sizeof(dbf_txt_buf), fmt, args);
+       vscnprintf(dbf_txt_buf, sizeof(dbf_txt_buf), fmt, args);
        va_end(args);
        debug_text_event(id, level, dbf_txt_buf);
 }
@@ -6330,8 +6332,8 @@ static int qeth_core_probe_device(struct ccwgroup_device *gdev)
                goto err_dev;
        }
 
-       snprintf(dbf_name, sizeof(dbf_name), "qeth_card_%s",
-               dev_name(&gdev->dev));
+       scnprintf(dbf_name, sizeof(dbf_name), "qeth_card_%s",
+                 dev_name(&gdev->dev));
        card->debug = qeth_get_dbf_entry(dbf_name);
        if (!card->debug) {
                rc = qeth_add_dbf_entry(card, dbf_name);

diff --git a/drivers/s390/net/qeth_ethtool.c b/drivers/s390/net/qeth_ethtool.c
index e250f49535fac586ef974481fc6e798d487f2dd9..c1caf7734c3e9edf34a6a59b319d6ae0d366286f 100644 (file)
--- a/drivers/s390/net/qeth_ethtool.c
+++ b/drivers/s390/net/qeth_ethtool.c
@@ -172,7 +172,7 @@ static void qeth_get_strings(struct net_device *dev, u32 stringset, u8 *data)
                qeth_add_stat_strings(&data, prefix, card_stats,
                                      CARD_STATS_LEN);
                for (i = 0; i < card->qdio.no_out_queues; i++) {
-                       snprintf(prefix, ETH_GSTRING_LEN, "tx%u ", i);
+                       scnprintf(prefix, ETH_GSTRING_LEN, "tx%u ", i);
                        qeth_add_stat_strings(&data, prefix, txq_stats,
                                              TXQ_STATS_LEN);
                }
@@ -192,8 +192,8 @@ static void qeth_get_drvinfo(struct net_device *dev,
                sizeof(info->driver));
        strscpy(info->fw_version, card->info.mcl_level,
                sizeof(info->fw_version));
-       snprintf(info->bus_info, sizeof(info->bus_info), "%s/%s/%s",
-                CARD_RDEV_ID(card), CARD_WDEV_ID(card), CARD_DDEV_ID(card));
+       scnprintf(info->bus_info, sizeof(info->bus_info), "%s/%s/%s",
+                 CARD_RDEV_ID(card), CARD_WDEV_ID(card), CARD_DDEV_ID(card));
 }
 
 static void qeth_get_channels(struct net_device *dev,

diff --git a/drivers/s390/net/qeth_l2_main.c b/drivers/s390/net/qeth_l2_main.c
index c6ded3fdd715c668e26e9b84b0f118168d5a19c8..9f13ed170a437b0314fe5c1708fd815dac271f46 100644 (file)
--- a/drivers/s390/net/qeth_l2_main.c
+++ b/drivers/s390/net/qeth_l2_main.c
@@ -1255,37 +1255,38 @@ static void qeth_bridge_emit_host_event(struct qeth_card *card,
 
        switch (evtype) {
        case anev_reg_unreg:
-               snprintf(str[i], sizeof(str[i]), "BRIDGEDHOST=%s",
-                               (code & IPA_ADDR_CHANGE_CODE_REMOVAL)
-                               ? "deregister" : "register");
+               scnprintf(str[i], sizeof(str[i]), "BRIDGEDHOST=%s",
+                         (code & IPA_ADDR_CHANGE_CODE_REMOVAL)
+                         ? "deregister" : "register");
                env[i] = str[i]; i++;
                if (code & IPA_ADDR_CHANGE_CODE_VLANID) {
-                       snprintf(str[i], sizeof(str[i]), "VLAN=%d",
-                               addr_lnid->lnid);
+                       scnprintf(str[i], sizeof(str[i]), "VLAN=%d",
+                                 addr_lnid->lnid);
                        env[i] = str[i]; i++;
                }
                if (code & IPA_ADDR_CHANGE_CODE_MACADDR) {
-                       snprintf(str[i], sizeof(str[i]), "MAC=%pM",
-                               addr_lnid->mac);
+                       scnprintf(str[i], sizeof(str[i]), "MAC=%pM",
+                                 addr_lnid->mac);
                        env[i] = str[i]; i++;
                }
-               snprintf(str[i], sizeof(str[i]), "NTOK_BUSID=%x.%x.%04x",
-                       token->cssid, token->ssid, token->devnum);
+               scnprintf(str[i], sizeof(str[i]), "NTOK_BUSID=%x.%x.%04x",
+                         token->cssid, token->ssid, token->devnum);
                env[i] = str[i]; i++;
-               snprintf(str[i], sizeof(str[i]), "NTOK_IID=%02x", token->iid);
+               scnprintf(str[i], sizeof(str[i]), "NTOK_IID=%02x", token->iid);
                env[i] = str[i]; i++;
-               snprintf(str[i], sizeof(str[i]), "NTOK_CHPID=%02x",
-                               token->chpid);
+               scnprintf(str[i], sizeof(str[i]), "NTOK_CHPID=%02x",
+                         token->chpid);
                env[i] = str[i]; i++;
-               snprintf(str[i], sizeof(str[i]), "NTOK_CHID=%04x", token->chid);
+               scnprintf(str[i], sizeof(str[i]), "NTOK_CHID=%04x",
+                         token->chid);
                env[i] = str[i]; i++;
                break;
        case anev_abort:
-               snprintf(str[i], sizeof(str[i]), "BRIDGEDHOST=abort");
+               scnprintf(str[i], sizeof(str[i]), "BRIDGEDHOST=abort");
                env[i] = str[i]; i++;
                break;
        case anev_reset:
-               snprintf(str[i], sizeof(str[i]), "BRIDGEDHOST=reset");
+               scnprintf(str[i], sizeof(str[i]), "BRIDGEDHOST=reset");
                env[i] = str[i]; i++;
                break;
        }
@@ -1314,17 +1315,17 @@ static void qeth_bridge_state_change_worker(struct work_struct *work)
                NULL
        };
 
-       snprintf(env_locrem, sizeof(env_locrem), "BRIDGEPORT=statechange");
-       snprintf(env_role, sizeof(env_role), "ROLE=%s",
-               (data->role == QETH_SBP_ROLE_NONE) ? "none" :
-               (data->role == QETH_SBP_ROLE_PRIMARY) ? "primary" :
-               (data->role == QETH_SBP_ROLE_SECONDARY) ? "secondary" :
-               "<INVALID>");
-       snprintf(env_state, sizeof(env_state), "STATE=%s",
-               (data->state == QETH_SBP_STATE_INACTIVE) ? "inactive" :
-               (data->state == QETH_SBP_STATE_STANDBY) ? "standby" :
-               (data->state == QETH_SBP_STATE_ACTIVE) ? "active" :
-               "<INVALID>");
+       scnprintf(env_locrem, sizeof(env_locrem), "BRIDGEPORT=statechange");
+       scnprintf(env_role, sizeof(env_role), "ROLE=%s",
+                 (data->role == QETH_SBP_ROLE_NONE) ? "none" :
+                 (data->role == QETH_SBP_ROLE_PRIMARY) ? "primary" :
+                 (data->role == QETH_SBP_ROLE_SECONDARY) ? "secondary" :
+                 "<INVALID>");
+       scnprintf(env_state, sizeof(env_state), "STATE=%s",
+                 (data->state == QETH_SBP_STATE_INACTIVE) ? "inactive" :
+                 (data->state == QETH_SBP_STATE_STANDBY) ? "standby" :
+                 (data->state == QETH_SBP_STATE_ACTIVE) ? "active" :
+                 "<INVALID>");
        kobject_uevent_env(&data->card->gdev->dev.kobj,
                                KOBJ_CHANGE, env);
        kfree(data);

diff --git a/drivers/s390/net/qeth_l3_main.c b/drivers/s390/net/qeth_l3_main.c
index 1cf4e354693f07a2f3163d77e1ffdc35a70166f8..af4e60d2917e9d6e8e1f9f412f24479f8a7156fe 100644 (file)
--- a/drivers/s390/net/qeth_l3_main.c
+++ b/drivers/s390/net/qeth_l3_main.c
@@ -47,9 +47,9 @@ int qeth_l3_ipaddr_to_string(enum qeth_prot_versions proto, const u8 *addr,
                             char *buf)
 {
        if (proto == QETH_PROT_IPV4)
-               return sprintf(buf, "%pI4", addr);
+               return scnprintf(buf, INET_ADDRSTRLEN, "%pI4", addr);
        else
-               return sprintf(buf, "%pI6", addr);
+               return scnprintf(buf, INET6_ADDRSTRLEN, "%pI6", addr);
 }
 
 static struct qeth_ipaddr *qeth_l3_find_addr_by_ip(struct qeth_card *card,

diff --git a/drivers/s390/net/qeth_l3_sys.c b/drivers/s390/net/qeth_l3_sys.c
index f3986c6e21b95f0169803318047abc7e31ab150f..9f90a860ca2c97b2f6e749aa727a0708ef4419c4 100644 (file)
--- a/drivers/s390/net/qeth_l3_sys.c
+++ b/drivers/s390/net/qeth_l3_sys.c
@@ -252,8 +252,8 @@ static ssize_t qeth_l3_dev_hsuid_store(struct device *dev,
                goto out;
        }
 
-       snprintf(card->options.hsuid, sizeof(card->options.hsuid),
-                "%-8s", tmp);
+       scnprintf(card->options.hsuid, sizeof(card->options.hsuid),
+                 "%-8s", tmp);
        ASCEBC(card->options.hsuid, 8);
        memcpy(card->dev->perm_addr, card->options.hsuid, 9);