From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-15.8 required=3.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,FREEMAIL_FORGED_FROMDOMAIN,FREEMAIL_FROM, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER,INCLUDES_PATCH, MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=unavailable autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 9D683C433E0 for ; Sun, 21 Feb 2021 15:49:33 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 6A7A164DA8 for ; Sun, 21 Feb 2021 15:49:33 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229926AbhBUPtL (ORCPT ); Sun, 21 Feb 2021 10:49:11 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:51140 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229974AbhBUPtH (ORCPT ); Sun, 21 Feb 2021 10:49:07 -0500 Received: from mail-pj1-x1044.google.com (mail-pj1-x1044.google.com [IPv6:2607:f8b0:4864:20::1044]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 14865C061574 for ; Sun, 21 Feb 2021 07:48:27 -0800 (PST) Received: by mail-pj1-x1044.google.com with SMTP id t9so1897763pjl.5 for ; Sun, 21 Feb 2021 07:48:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gBYFtcJZcZKb20Kar3p64aL77O4EaWVVtcrsH+u69Zk=; b=d9obCbkDJqa0v5MTYG5Xa7DJ2NSf8UNLgwiBAVjWXeMk3zNqjmClrKWhHK1yWvKh31 ojcSkxB+YtsZL3g5fbJqSn4+aD+TRY9dP+48eebDMiFa6ZaQC/d6/Up2u3gBIQwpkXzD PNu7z2ibulKv61xotsawidIrMPmgUHApPJfAnP24PKfKCaSBYdf05CN++D4jaxBQhRQk cMwb8z2EogZ8Vcvyy49wFG0c8735uNRZP17CZRiOl47MQEXNJZs2OfnX2ZMB4m+WWz82 byzsp4hmKI8P7VNA76z+RsQzybFIxkvbbOKgl095go+7odtJrTBEq4DvUx5yyQ08hgUa 3K9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gBYFtcJZcZKb20Kar3p64aL77O4EaWVVtcrsH+u69Zk=; b=ZSJF1C/CNJ4d98WKr7PLDhi/iMh6yQdLs96U+vYO8ykfjbhY/9MIl6KINGAJ1imCaG oc5yYgL8Q3cqKziXlJrUEG0i+yDd2zp0ilMAlUdY82KaAo4Hia0G6cDe3dVDguqnlS1/ yf86xhVJ6NFAhlz9G9eOmOEodu8+zr9odhOmDxIlL5lJEI1Ns1IEXhfILiVzI14FHlk9 JkNjPlotfeF0AHAl2lFxqE0jdrrsu7QItO+R7P04g5dGJVOQlMf5u40JA8kyeNmG/Yj+ lDolzzJlTzVJIdowcQSyAdaNb5x473MB1A6tDT+3CPCX6GP2VIrDkXoZe2t7KG1SObNk ICEg== X-Gm-Message-State: AOAM533/fgi6d2vNrLh0GqSSvCc8KQLlHsMxgkm0qY1ZoOh5Ws09eVgg HeL3K4BL1l7kvBKFStZoy3Y= X-Google-Smtp-Source: ABdhPJzyhpN4aJWn5k3wG1M156iVDl7M+1WgaPnz4rv4lodb6j2hFwdo7OnY2CNOmUk5f9UgG6ZeiQ== X-Received: by 2002:a17:90a:a08a:: with SMTP id r10mr18719275pjp.133.1613922506409; Sun, 21 Feb 2021 07:48:26 -0800 (PST) Received: from localhost ([2402:3a80:11da:dffe:a2a4:c5ff:fe20:7222]) by smtp.gmail.com with ESMTPSA id i2sm8348052pgs.82.2021.02.21.07.48.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 07:48:26 -0800 (PST) From: Kumar Kartikeya Dwivedi To: devel@driverdev.osuosl.org, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org Cc: Kumar Kartikeya Dwivedi , Vaibhav Agarwal , Mark Greer , Johan Hovold , Alex Elder , greybus-dev@lists.linaro.org Subject: [PATCH] staging/greybus: eliminate use of NAME_SIZE for strings Date: Sun, 21 Feb 2021 21:12:59 +0530 Message-Id: <20210221154258.119503-1-memxor@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Instead, depend on the size of the destination buffer for easier refactoring. Signed-off-by: Kumar Kartikeya Dwivedi --- Hopefully, this is more thorough. The only cases left now are where the destination string is represented by a pointer, otherwise all call sites with a fixed sized buffer have been changed. --- drivers/staging/greybus/audio_module.c | 4 ++-- drivers/staging/greybus/audio_topology.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/greybus/audio_module.c b/drivers/staging/greybus/audio_module.c index 0f9fdc077..12c376c47 100644 --- a/drivers/staging/greybus/audio_module.c +++ b/drivers/staging/greybus/audio_module.c @@ -260,7 +260,7 @@ static int gb_audio_probe(struct gb_bundle *bundle, INIT_LIST_HEAD(&gbmodule->widget_ctl_list); INIT_LIST_HEAD(&gbmodule->jack_list); gbmodule->dev = dev; - snprintf(gbmodule->name, NAME_SIZE, "%s.%s", dev->driver->name, + snprintf(gbmodule->name, sizeof(gbmodule->name), "%s.%s", dev->driver->name, dev_name(dev)); greybus_set_drvdata(bundle, gbmodule); @@ -342,7 +342,7 @@ static int gb_audio_probe(struct gb_bundle *bundle, /* inform above layer for uevent */ dev_dbg(dev, "Inform set_event:%d to above layer\n", 1); /* prepare for the audio manager */ - strscpy(desc.name, gbmodule->name, GB_AUDIO_MANAGER_MODULE_NAME_LEN); + strscpy(desc.name, gbmodule->name, sizeof(desc.name)); desc.vid = 2; /* todo */ desc.pid = 3; /* todo */ desc.intf_id = gbmodule->dev_id; diff --git a/drivers/staging/greybus/audio_topology.c b/drivers/staging/greybus/audio_topology.c index e816e4db5..1fc7727ab 100644 --- a/drivers/staging/greybus/audio_topology.c +++ b/drivers/staging/greybus/audio_topology.c @@ -200,7 +200,7 @@ static int gbcodec_mixer_ctl_info(struct snd_kcontrol *kcontrol, return -EINVAL; name = gbaudio_map_controlid(module, data->ctl_id, uinfo->value.enumerated.item); - strscpy(uinfo->value.enumerated.name, name, NAME_SIZE); + strscpy(uinfo->value.enumerated.name, name, sizeof(uinfo->value.enumerated.name)); break; default: dev_err(comp->dev, "Invalid type: %d for %s:kcontrol\n", @@ -363,7 +363,7 @@ static int gbcodec_mixer_dapm_ctl_info(struct snd_kcontrol *kcontrol, platform_min = le32_to_cpu(info->value.integer.min); if (platform_max == 1 && - !strnstr(kcontrol->id.name, " Volume", NAME_SIZE)) + !strnstr(kcontrol->id.name, " Volume", sizeof(kcontrol->id.name))) uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; else uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; @@ -1047,8 +1047,8 @@ static int gbaudio_tplg_create_widget(struct gbaudio_module_info *module, } /* Prefix dev_id to widget control_name */ - strscpy(temp_name, w->name, NAME_SIZE); - snprintf(w->name, NAME_SIZE, "GB %d %s", module->dev_id, temp_name); + strscpy(temp_name, w->name, sizeof(temp_name)); + snprintf(w->name, sizeof(w->name), "GB %d %s", module->dev_id, temp_name); switch (w->type) { case snd_soc_dapm_spk: @@ -1169,8 +1169,8 @@ static int gbaudio_tplg_process_kcontrols(struct gbaudio_module_info *module, } control->id = curr->id; /* Prefix dev_id to widget_name */ - strscpy(temp_name, curr->name, NAME_SIZE); - snprintf(curr->name, NAME_SIZE, "GB %d %s", module->dev_id, + strscpy(temp_name, curr->name, sizeof(temp_name)); + snprintf(curr->name, sizeof(curr->name), "GB %d %s", module->dev_id, temp_name); control->name = curr->name; if (curr->info.type == GB_AUDIO_CTL_ELEM_TYPE_ENUMERATED) { -- 2.29.2 From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-13.5 required=3.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED,DKIM_INVALID,DKIM_SIGNED,FREEMAIL_FORGED_FROMDOMAIN, FREEMAIL_FROM,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_CR_TRAILER, INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id DE344C433E0 for ; Sun, 21 Feb 2021 15:48:36 +0000 (UTC) Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 7B49864DA8 for ; Sun, 21 Feb 2021 15:48:36 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 7B49864DA8 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=driverdev-devel-bounces@linuxdriverproject.org Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 50AD085D41; Sun, 21 Feb 2021 15:48:36 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Kb3p3ToqP5Hv; Sun, 21 Feb 2021 15:48:33 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 5B8FE85CFE; Sun, 21 Feb 2021 15:48:33 +0000 (UTC) Received: from smtp3.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id 3CE7A1BF954 for ; Sun, 21 Feb 2021 15:48:31 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by smtp3.osuosl.org (Postfix) with ESMTP id 262B560596 for ; Sun, 21 Feb 2021 15:48:31 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from smtp3.osuosl.org ([127.0.0.1]) by localhost (smtp3.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id X0hT0zeFr59W for ; Sun, 21 Feb 2021 15:48:29 +0000 (UTC) Received: by smtp3.osuosl.org (Postfix, from userid 1001) id E7CC060701; Sun, 21 Feb 2021 15:48:29 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.8.0 Received: from mail-pl1-f194.google.com (mail-pl1-f194.google.com [209.85.214.194]) by smtp3.osuosl.org (Postfix) with ESMTPS id 39F0660596 for ; Sun, 21 Feb 2021 15:48:27 +0000 (UTC) Received: by mail-pl1-f194.google.com with SMTP id e9so6070514plh.3 for ; Sun, 21 Feb 2021 07:48:27 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=gBYFtcJZcZKb20Kar3p64aL77O4EaWVVtcrsH+u69Zk=; b=d9obCbkDJqa0v5MTYG5Xa7DJ2NSf8UNLgwiBAVjWXeMk3zNqjmClrKWhHK1yWvKh31 ojcSkxB+YtsZL3g5fbJqSn4+aD+TRY9dP+48eebDMiFa6ZaQC/d6/Up2u3gBIQwpkXzD PNu7z2ibulKv61xotsawidIrMPmgUHApPJfAnP24PKfKCaSBYdf05CN++D4jaxBQhRQk cMwb8z2EogZ8Vcvyy49wFG0c8735uNRZP17CZRiOl47MQEXNJZs2OfnX2ZMB4m+WWz82 byzsp4hmKI8P7VNA76z+RsQzybFIxkvbbOKgl095go+7odtJrTBEq4DvUx5yyQ08hgUa 3K9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=gBYFtcJZcZKb20Kar3p64aL77O4EaWVVtcrsH+u69Zk=; b=RgSnQ824BWtt6Ybc8LNo/6keOVPwcYeOECT9v3PFLvm3NZV9WA1dNV5TQGMJX6ECl0 mWMfzerbg7YHz4Cwm5pCAsVqjGp17ZCmYTfUBlzSEbMGU4uOXTcvJ3xF+Mx5xy8XfSJw O33zBkxhy7jqyJdJ4ovjki8kByBJip37L1Yi8oJoU81fZF3W5k5SZT8QcQJXTsBQzQLp /iMwZIyPIdbKNTRM6dd2qfBsQHf1nHnEzYwsmUo7fL8cTTZfqiSbRPOTqSWwpiSg8eES /9km97yZt2jw1LI6vWL4XBLQyJyJ5r8QLCzaSNrQtszrotmChvrAABzPVHTG862wuJH7 e2GQ== X-Gm-Message-State: AOAM532sbc6umWvsmbrPN4ipK+Ys8DM8hXKFXPHSyINIHY/Ek/ypNXbm uR8/21CbBOu+W8ga1kXoMidSS3hOTco= X-Google-Smtp-Source: ABdhPJzyhpN4aJWn5k3wG1M156iVDl7M+1WgaPnz4rv4lodb6j2hFwdo7OnY2CNOmUk5f9UgG6ZeiQ== X-Received: by 2002:a17:90a:a08a:: with SMTP id r10mr18719275pjp.133.1613922506409; Sun, 21 Feb 2021 07:48:26 -0800 (PST) Received: from localhost ([2402:3a80:11da:dffe:a2a4:c5ff:fe20:7222]) by smtp.gmail.com with ESMTPSA id i2sm8348052pgs.82.2021.02.21.07.48.25 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 21 Feb 2021 07:48:26 -0800 (PST) From: Kumar Kartikeya Dwivedi To: devel@driverdev.osuosl.org, gregkh@linuxfoundation.org, linux-kernel@vger.kernel.org Subject: [PATCH] staging/greybus: eliminate use of NAME_SIZE for strings Date: Sun, 21 Feb 2021 21:12:59 +0530 Message-Id: <20210221154258.119503-1-memxor@gmail.com> X-Mailer: git-send-email 2.29.2 In-Reply-To: References: MIME-Version: 1.0 X-BeenThere: driverdev-devel@linuxdriverproject.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux Driver Project Developer List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Alex Elder , Vaibhav Agarwal , Mark Greer , Johan Hovold , greybus-dev@lists.linaro.org, Kumar Kartikeya Dwivedi Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: driverdev-devel-bounces@linuxdriverproject.org Sender: "devel" Instead, depend on the size of the destination buffer for easier refactoring. Signed-off-by: Kumar Kartikeya Dwivedi --- Hopefully, this is more thorough. The only cases left now are where the destination string is represented by a pointer, otherwise all call sites with a fixed sized buffer have been changed. --- drivers/staging/greybus/audio_module.c | 4 ++-- drivers/staging/greybus/audio_topology.c | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/drivers/staging/greybus/audio_module.c b/drivers/staging/greybus/audio_module.c index 0f9fdc077..12c376c47 100644 --- a/drivers/staging/greybus/audio_module.c +++ b/drivers/staging/greybus/audio_module.c @@ -260,7 +260,7 @@ static int gb_audio_probe(struct gb_bundle *bundle, INIT_LIST_HEAD(&gbmodule->widget_ctl_list); INIT_LIST_HEAD(&gbmodule->jack_list); gbmodule->dev = dev; - snprintf(gbmodule->name, NAME_SIZE, "%s.%s", dev->driver->name, + snprintf(gbmodule->name, sizeof(gbmodule->name), "%s.%s", dev->driver->name, dev_name(dev)); greybus_set_drvdata(bundle, gbmodule); @@ -342,7 +342,7 @@ static int gb_audio_probe(struct gb_bundle *bundle, /* inform above layer for uevent */ dev_dbg(dev, "Inform set_event:%d to above layer\n", 1); /* prepare for the audio manager */ - strscpy(desc.name, gbmodule->name, GB_AUDIO_MANAGER_MODULE_NAME_LEN); + strscpy(desc.name, gbmodule->name, sizeof(desc.name)); desc.vid = 2; /* todo */ desc.pid = 3; /* todo */ desc.intf_id = gbmodule->dev_id; diff --git a/drivers/staging/greybus/audio_topology.c b/drivers/staging/greybus/audio_topology.c index e816e4db5..1fc7727ab 100644 --- a/drivers/staging/greybus/audio_topology.c +++ b/drivers/staging/greybus/audio_topology.c @@ -200,7 +200,7 @@ static int gbcodec_mixer_ctl_info(struct snd_kcontrol *kcontrol, return -EINVAL; name = gbaudio_map_controlid(module, data->ctl_id, uinfo->value.enumerated.item); - strscpy(uinfo->value.enumerated.name, name, NAME_SIZE); + strscpy(uinfo->value.enumerated.name, name, sizeof(uinfo->value.enumerated.name)); break; default: dev_err(comp->dev, "Invalid type: %d for %s:kcontrol\n", @@ -363,7 +363,7 @@ static int gbcodec_mixer_dapm_ctl_info(struct snd_kcontrol *kcontrol, platform_min = le32_to_cpu(info->value.integer.min); if (platform_max == 1 && - !strnstr(kcontrol->id.name, " Volume", NAME_SIZE)) + !strnstr(kcontrol->id.name, " Volume", sizeof(kcontrol->id.name))) uinfo->type = SNDRV_CTL_ELEM_TYPE_BOOLEAN; else uinfo->type = SNDRV_CTL_ELEM_TYPE_INTEGER; @@ -1047,8 +1047,8 @@ static int gbaudio_tplg_create_widget(struct gbaudio_module_info *module, } /* Prefix dev_id to widget control_name */ - strscpy(temp_name, w->name, NAME_SIZE); - snprintf(w->name, NAME_SIZE, "GB %d %s", module->dev_id, temp_name); + strscpy(temp_name, w->name, sizeof(temp_name)); + snprintf(w->name, sizeof(w->name), "GB %d %s", module->dev_id, temp_name); switch (w->type) { case snd_soc_dapm_spk: @@ -1169,8 +1169,8 @@ static int gbaudio_tplg_process_kcontrols(struct gbaudio_module_info *module, } control->id = curr->id; /* Prefix dev_id to widget_name */ - strscpy(temp_name, curr->name, NAME_SIZE); - snprintf(curr->name, NAME_SIZE, "GB %d %s", module->dev_id, + strscpy(temp_name, curr->name, sizeof(temp_name)); + snprintf(curr->name, sizeof(curr->name), "GB %d %s", module->dev_id, temp_name); control->name = curr->name; if (curr->info.type == GB_AUDIO_CTL_ELEM_TYPE_ENUMERATED) { -- 2.29.2 _______________________________________________ devel mailing list devel@linuxdriverproject.org http://driverdev.linuxdriverproject.org/mailman/listinfo/driverdev-devel