From patchwork Fri Jul 14 12:06:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 107780 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp887044obm; Fri, 14 Jul 2017 05:09:05 -0700 (PDT) X-Received: by 10.99.176.7 with SMTP id h7mr14428344pgf.152.1500034144912; Fri, 14 Jul 2017 05:09:04 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500034144; cv=none; d=google.com; s=arc-20160816; b=IXixFgK5DD+aVq2X6bkaPUZgNLkDrlmGN0jq0XWfTkouFCyODW2MAmlHvhWzFO/ODZ 5m4PCZBweIncvRugO1d1utdWRVAmGS8cmXtbezlCofU2XUaZimZZae9c2LD5gbXVD7Bq jsKehTe+ZltS4tgQRy7APTnxoiDyLIaflG4sdwiGAuzTzqwAj0nACtKtQZ4BpmYg8Hzy NgOBAVdaKgXBdQLAHAcihB2CCxrAwPW6u+DWrUdN9Z7YvlhoA+qzd+HCvVY6AN3t5h5s zAJuq/FG14w7xo4dUp+z6uTR1YPTk4M8yd1jltInhSJha63szPOoSHSwB70M8CjjBq27 EyqQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=Wz47RoEuRLrEzcFPMdxrKwxGOR8ah9NJ873ZPiZLI0k=; b=vkP9Q2xSeN5zYm9YCam1IB6RJHfzBXvUUo615IAehOg6RQPFcyrSoDzF6jOmeUL+iq kCLGQWLgwauSlkYnwpwOS0INAKVYrgVKM6CAzyfjFpg3EHvYpLPU6dtnO50YFQN/CFzf /TXbbDAhp6A/JB1ika8fKZG38BCTS9W1u7ZXZ7m3MgUueyGJ0OP6koUUYo7nPki756XW mbU2KdTnjme4Za81ErAg0nsIrjeU7RHpclaq+KScC4P2Mnmq9xG7s7bM7imYpD20kQjp 3SOMTLOkHNwD0dAZQdubdxzK2a6bfZFwROyUC6IJG2YnrgHejKkYbYHlXO9nzeh0fL9s 3UEA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f8si6340495pfk.318.2017.07.14.05.09.04; Fri, 14 Jul 2017 05:09:04 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932148AbdGNMIx (ORCPT + 25 others); Fri, 14 Jul 2017 08:08:53 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:61866 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753830AbdGNMIv (ORCPT ); Fri, 14 Jul 2017 08:08:51 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0M3jdZ-1dnnPo0jw1-00rFxu; Fri, 14 Jul 2017 14:07:41 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Masahiro Yamada , Michal Marek Cc: Greg Kroah-Hartman , Linus Torvalds , Guenter Roeck , akpm@linux-foundation.org, netdev@vger.kernel.org, "David S . Miller" , "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi@vger.kernel.org, x86@kernel.org, Arnd Bergmann , linux-kbuild@vger.kernel.org Subject: [PATCH 01/22] kbuild: disable -Wformat-truncation warnings by default Date: Fri, 14 Jul 2017 14:06:53 +0200 Message-Id: <20170714120720.906842-2-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170714120720.906842-1-arnd@arndb.de> References: <20170714120720.906842-1-arnd@arndb.de> X-Provags-ID: V03:K0:92WWBQ7B8PToazBKMpJ+DptMaDwg6IrCD4LO39e1mXqU4uGPBTh /pH56XafZfDxEZjT59Xth0zeiFb2TrJ//vUXUbiaFZiPXrFyOXTE15BONJzTeAm/z2IDDXs 3w7K5lapDYwdL0eQF2wGw1mOHuxGBnnOFrjLFnwWqLcCDufQS5Sp+F/D2JsqbcFbPE4aUdS uPAq8FxcJ6MPjQ2DbJxMA== X-UI-Out-Filterresults: notjunk:1; V01:K0:nqvDx+noyQ8=:CMWp9m/jS86Czc/EDGMPpY fkGork8cIfISdPA0g/XUz8B47xY0mQNNHMIcgssdyUnP3baEXT9jl0DGXdbVGcsoYBLN7MRxA 2lwEQSazzDwezpLBPafwvRvbrB5mpvmIvwF0J+YF/YH8GnmBQfde7FRz+XfqHeBDzJC6xic+L lq9bk5+/OiF/GAbJt4ldeaa8G8vb03o3M79xdT5tg/iwCez56pkdYv5nU3XxcXogTuOmsRhbm w/wSOhpacRoKgT7uRW+8iJ6sjGDrpGxwDgvoGrMkadgghhelVBSPNQWNCm/pdZ1fu7k45gjqv 4Vc/u7eeaFA2fBWWWbiVMWidnAqHcQ8JdfOYlKsBIPMnXP5yXceoCa5MnAWHSb0BOgaYa1CJm u2J0cHJ+6+Yeaj9q13DvYIHDzT1gpkFmyz3tCb2Mz3CS6gPBuPvkRDfYepNmdgYKmheNaPO/O Ej5QfcKZ0/KoEM1zwPI2DvBnRz5kIUW2wPWo5URlB7OkGkWYUWJdYfFYV9dtjGak9zDSJMT42 yRiJ4ti8Z733AtqJJEks+IoC7w9rVEmI+HoI0MRaQkfRsVY8nfZt4jd4dWUFkiqBw5Rd1pQEt FPMBWbMs9RuoVkQYkxWOrbICAcbh9ds29aT0jTcynXC44QzqjzCaMaL+NrhW7naYUzSoInOSo 6pPxkMnCdJ1vISrPs4/KReohh5SpQM6dwgxSG0N6XaD2GNK/b6tMGMm5PKMfS0+U2ZOwIB4uE 0qFtsHxF6W8s0bLAR3M24cI2P0zAkyo9dkuQDA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org With x86 allmodconfig, we currently get 233 -Wformat-truncation warnings, which makes the entire warnings rather useless. This turns off the warning by default, unless we specify W=1 or higher Signed-off-by: Arnd Bergmann --- scripts/Makefile.extrawarn | 3 +++ 1 file changed, 3 insertions(+) -- 2.9.0 diff --git a/scripts/Makefile.extrawarn b/scripts/Makefile.extrawarn index fb3522fd8702..4b63c2f71adb 100644 --- a/scripts/Makefile.extrawarn +++ b/scripts/Makefile.extrawarn @@ -67,5 +67,8 @@ KBUILD_CFLAGS += $(call cc-disable-warning, format) KBUILD_CFLAGS += $(call cc-disable-warning, sign-compare) KBUILD_CFLAGS += $(call cc-disable-warning, format-zero-length) KBUILD_CFLAGS += $(call cc-disable-warning, uninitialized) +else +# noisy gcc-7 warnings +KBUILD_CFLAGS += $(call cc-option,-Wformat-truncation=0) endif endif From patchwork Fri Jul 14 12:06:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 107781 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp887423obm; Fri, 14 Jul 2017 05:09:21 -0700 (PDT) X-Received: by 10.98.110.65 with SMTP id j62mr4882566pfc.115.1500034160950; Fri, 14 Jul 2017 05:09:20 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500034160; cv=none; d=google.com; s=arc-20160816; b=vxMKo2BLM9tyGOLQ61CGN2mPdCec9sQZIh5ROTRvkCiSP49ZOfctcDek+960aY9Nd0 DW1NGvC6fLUbtq9gjpG32Di3hxY7KLdLEUh+/QUKJV+qdoIta54i/rbbo1mFoeUyMCbs K2hkdJMPoKGZAG8GZQd0dhD45STzxBL1XW1ICLkYfHYkCG0TSne9WghBiFDSAl+Rz22r oM8jtJ0d4Dz7iF+j+tPCUqlVQAM4/Qtt5bEwrC6oS8mbWCtndujLqXZEdxlNG9QYEVrs J/Rbn4gGXk+7KCcyT0TaLb2cXsxP7WoB76174XRzU3WNw7eYPT7D40jT1nkymtq0emGE TtOA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=262vGeQ9WJhAO65yl3yKZBkTYBmDYGaWPyy5MXiW1W0=; b=S5QTWOG7he4M7y3HqonDtqWHS/HdBuIqVWyz7GyGONL0MKs62Ke1K7omB7j/wfdjqk OGj3IX4ltnwDYlOL6LchQcwZcSPfN0WxdyxV1B+xKYtptjitjZBnGsTzoyEWX9D6QGLg zUrYLnZiLrZxIIx4P22xtLbUjME/XJT72bEnHROBXyS8ZKvxVHQ8ARHxoqXoC7TqKkDX Am5O9rtOdvqc45IySv1ScNsVK27VUzyZUSduLXx3DTkFs0jgumQepZ1iiWEnbmOfJHsq 75sgM2jRiTqt1wCYeoV4tAkxWx1ZY+dkFQOzm5jDdIQJFeDuA6g9FzlaZ6n87JnNA0H6 gWjQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v13si6220282pfl.72.2017.07.14.05.09.20; Fri, 14 Jul 2017 05:09:20 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932173AbdGNMJG (ORCPT + 25 others); Fri, 14 Jul 2017 08:09:06 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:65474 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932149AbdGNMJD (ORCPT ); Fri, 14 Jul 2017 08:09:03 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0MeSpb-1dIZfD3xIl-00QB4q; Fri, 14 Jul 2017 14:07:53 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Kashyap Desai , Sumit Saxena , Shivasharan S , "James E.J. Bottomley" , "Martin K. Petersen" Cc: Greg Kroah-Hartman , Linus Torvalds , Guenter Roeck , akpm@linux-foundation.org, netdev@vger.kernel.org, "David S . Miller" , linux-scsi@vger.kernel.org, x86@kernel.org, Arnd Bergmann , megaraidlinux.pdl@broadcom.com Subject: [PATCH 02/22] scsi: megaraid: fix format-overflow warning Date: Fri, 14 Jul 2017 14:06:54 +0200 Message-Id: <20170714120720.906842-3-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170714120720.906842-1-arnd@arndb.de> References: <20170714120720.906842-1-arnd@arndb.de> X-Provags-ID: V03:K0:Nb/jSZEPUrrWrTuddNu5j02hMmleDrl2lRs7UNncR+y5EXQZ6iM 4Ypfc2vcETd6SMqN4z01Gc3hWMi/V+9dK0tVD7iARL24Gp0V3vtUFO+cFUi3IBa18quLroD 6iQd+Gi/bk42hgmyPmzbBCRk5wKoJ7LhKXhpQXvsY/CwJcFMOaHlCMmGnaOfGgGTBcCVGRn 2vYWzoNAHYxYmR/5e86ZA== X-UI-Out-Filterresults: notjunk:1; V01:K0:9Q7FjPlab+8=:5Yc5hFKcRdDMMdv3StKDaK gBqFvJZerPD+WbgLt4dyZUCI/GQTJzm2tbmVd2lygNT+4daPutdtbJnmRmNmzgz+kV73Qcevz 4sZk9JgAwugVVJpiIekMAUdPgW2nwifeuv3tceCB+PgPqGguQP7/qWSTkrbCUDuIeWJ9Ldovg Z2Scvx/2hpXJFgKXSatVJCuGwd4HofZWPOahfTNYp9FKcJp3z+AzPr5m88W7qayUToJvBvH1Z 12P/0hdz3Q1Iwf9W2FnPhOT4t+er2tiXTjkpkxrmw35GeUt9VY079rnrZTDBbhHtgV11wQDcl 7GrrDqALWpEUdBYqgMUJrgK6SjiYcwA/+BzkmokzCh54UBOr4Ee+jIBFKnrQiuSfhFpAmNuft xL8EVfYNL73+yFqgfbLJ5prF00+6rNxYO5fk1OKiusDAbXcWj2UIcBGzzgH2Vkup85b4CP4uj b/ndBtDA5xeAl9YGr9qOduAWWr1w0elWBqK4gJdTcuDJdMlb/PZCfc25JuM5ycH4uTaL/ZARf sLNASif5FNMe7GadHTLkZusDZ8GxeRcrkK68mvVTIUfubNnYaIyi7cj9KyMMExGkCa1611xdh QJ77PdYntdZN33w1OOlArMFx1zhi47/gCc+ts0nY3pGoW4P2/AshNXDQRp/azA2Q7OFplcadG /zR+Q+9IigsWMuLSAYcCIxGNGoj7WVHWwqCcS+ioJc1qg6aLTusYmrxKzNyGieyJ38Y3Tof66 VdV3JC+7g1yfeTivrScElL3SOLj6QJHj/iihEA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc-7 complains that the firmware version strings might overflow for some values: drivers/scsi/megaraid.c: In function 'megaraid_probe_one': drivers/scsi/megaraid.c:314:33: error: '%d' directive writing between 1 and 2 bytes into a region of size between 1 and 2 [-Werror=format-overflow=] drivers/scsi/megaraid.c:314:33: note: directive argument in the range [0, 15] drivers/scsi/megaraid.c:314:3: note: 'sprintf' output between 7 and 9 bytes into a destination of size 7 drivers/scsi/megaraid.c:320:35: error: '%d' directive writing between 1 and 2 bytes into a region of size between 1 and 2 [-Werror=format-overflow=] drivers/scsi/megaraid.c:320:35: note: directive argument in the range [0, 15] drivers/scsi/megaraid.c:320:3: note: 'sprintf' output between 7 and 9 bytes into a destination of size 7 This makes the code use a truncating snprintf() instead, which shuts up that warning. Signed-off-by: Arnd Bergmann --- drivers/scsi/megaraid.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/scsi/megaraid.c b/drivers/scsi/megaraid.c index 3c63c292cb92..7195cff51d4c 100644 --- a/drivers/scsi/megaraid.c +++ b/drivers/scsi/megaraid.c @@ -311,13 +311,15 @@ mega_query_adapter(adapter_t *adapter) right 8 bits making them zero. This 0 value was hardcoded to fix sparse warnings. */ if (adapter->product_info.subsysvid == PCI_VENDOR_ID_HP) { - sprintf (adapter->fw_version, "%c%d%d.%d%d", + snprintf(adapter->fw_version, sizeof(adapter->fw_version), + "%c%d%d.%d%d", adapter->product_info.fw_version[2], 0, adapter->product_info.fw_version[1] & 0x0f, 0, adapter->product_info.fw_version[0] & 0x0f); - sprintf (adapter->bios_version, "%c%d%d.%d%d", + snprintf(adapter->bios_version, sizeof(adapter->fw_version), + "%c%d%d.%d%d", adapter->product_info.bios_version[2], 0, adapter->product_info.bios_version[1] & 0x0f, From patchwork Fri Jul 14 12:06:55 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 107782 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp888277obm; Fri, 14 Jul 2017 05:10:01 -0700 (PDT) X-Received: by 10.99.54.205 with SMTP id d196mr14538880pga.79.1500034201190; Fri, 14 Jul 2017 05:10:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500034201; cv=none; d=google.com; s=arc-20160816; b=mPD7exflLSpop3TGiSPe0M35Z9+Xjh00CgJUn3bhZNhd9crLx3JU+7wE0rSfIpFimm U5D/gu2nn+OAOQ8VvSqxK47x7Goyh+dWpvh4VvIGRqQdGp2XM+ecftf37aVQ8gWYYgKk RDkLemnSTxnl+jP/kIunU+TSmuKLhoGCEl3sJfkXrBxIJ04q3bk48Ae9fcW8eAg0BYZX AjQm9Kgktn2VYirOMN14yA3oD3uL09rKVNGAawk8+OCcDqmKzKm/nTFagH7gceGa4PNM qkXIypQR3Wm2BiNBT+DhwZxS3nK9GsjkqwAphaScE3TYDQNZ8wuIz5NHPvntN8exh2Du ksGQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=NE8BDHpftwALD1x3PxkYDFcTP+cugxOupaha88SNNn8=; b=DM4z/42/sZETJ2nVy2MirJek2k3eKsi4cjbEvsaNKA6of3TGOxLRCO4TMDGKTJG9/T nEsrPq8N72/m3owCel4klz1yeuzV2D2WupK1+g5KXYuXyo9YqC2iOOCbM2ZKMoBZiZk1 V0MGzYrRlr5RDWgA5E37SXPSY2v1gzNWLbLBA5ftx2m0ZwypSfbIvqh2zLBSmd5wzhgJ 4dO/PYOkmIeu4bxwFcdzfo29kJ2dqDEu3T4NWrlPqiPivdiNRh26Tp7ZYYPWOillGsme 1c6lzsl/JBhldWbngGjmDWWpK8bCBX800ucsaZROXndlWnWkCA+Tssuj6cbAGGAYDNlJ xN8w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g34si6873010pld.318.2017.07.14.05.10.00; Fri, 14 Jul 2017 05:10:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754067AbdGNMJm (ORCPT + 25 others); Fri, 14 Jul 2017 08:09:42 -0400 Received: from mout.kundenserver.de ([217.72.192.75]:52310 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753687AbdGNMJk (ORCPT ); Fri, 14 Jul 2017 08:09:40 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0M731J-1dtH4f10ab-00wljm; Fri, 14 Jul 2017 14:08:08 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Sathya Prakash , Chaitra P B , Suganath Prabu Subramani , "James E.J. Bottomley" , "Martin K. Petersen" Cc: Greg Kroah-Hartman , Linus Torvalds , Guenter Roeck , akpm@linux-foundation.org, netdev@vger.kernel.org, "David S . Miller" , linux-scsi@vger.kernel.org, x86@kernel.org, Arnd Bergmann , Hannes Reinecke , Calvin Owens , Adam Manzanares , Bart Van Assche , James Bottomley , MPT-FusionLinux.pdl@broadcom.com Subject: [PATCH 03/22] scsi: mpt3sas: fix format overflow warning Date: Fri, 14 Jul 2017 14:06:55 +0200 Message-Id: <20170714120720.906842-4-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170714120720.906842-1-arnd@arndb.de> References: <20170714120720.906842-1-arnd@arndb.de> X-Provags-ID: V03:K0:ZAl+axRAaNJy5r7jWMOo3X6azDOyn9oP0ojg5+2IN0QdCyjmrZi 9LsQ9fB1s4V0DJvFSsEV470ZOxIk/tERn0bFQPXKH6rOMvgd4DEQHLNPfoMVK+Iu34qktSX iea91MwKWHJnBbQx8a+eluXFKhK1+QW0vTnSyMnzTzctZBs7MoxbyRkngzhPk98WcFdkLMT sua0XhBqtrezR8+8kOjpw== X-UI-Out-Filterresults: notjunk:1; V01:K0:wcIKB2Ug7hA=:p/7+76FywvdqHjWDNgt+Iv RE55SMrWHnQ7GGDVx5OyworTyO8i3h2MFZqPrdQmfzkekGd6FR3Vxsl5+cTSMhoUksYOPMUuY mMl3TCkzWoqFCFDgM3B8gq1CwR05cVdadZIKfVHyszWv7dEOZjBkD4PM8ISXGMnEiCM4NC8JU upKCqlQ//CKO8Q2zZR2IElSDo+0FO/l/UThTjZEyCbG9smcGHz29Ew2H+uCKUgmadYncRgSyC t1BPncqOJS2b8Yd8hUDyddxya5b8MCw4bCoGjDHTeBVt0WKUQhmkLaMvWk604v8x7LO2XUZ93 qeME5pW6DglYg/49WoGze0yljuqknfLD89c5SZSwdC85d2a4LKFT4XMjwPLCqaoPqtVLZlN0y +YMo3zV4N5tF0Brisez7EsJBm9aPNyp+H0DFUrGicO2to/o3Lw/xDts6xzrWdhzi0Aqhkx2v4 Yte0WMpZa1jukwNMfmkXDRGastU6GEcbwkpPtU1n34KLZpzeEiRL49QVFxp6n5BHw1v6L5eDQ C8jNZ7TNELJvsVJBRqLigi2e18hX9ZdAsBVJh42ZuJ1fjjg9qhNL4vvFLBSif7oVaclulccRE /OEuqSUKZFRWp88EpWyUOrY2EsQ5HW5QsUSvjJcZeLciiiJw/StyQubN47FWTEBAV3Ll2T8kn jPsZZNjOB9AAtbhr0JYv+h30I0qyXOyxbPvQqTRmrZPQgOkoqUNyOnzKT83qEZifjmc1bi1wQ X886o19/dBlG0g2Bk2DQ7lcV4W9Dag+PrDwEDQ== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We print the driver name into one string and then add and ID and copy it into a second string of the same length, at which point gcc complains about a possible overflow: drivers/scsi/mpt3sas/mpt3sas_scsih.c: In function '_scsih_probe': drivers/scsi/mpt3sas/mpt3sas_scsih.c:8884:21: error: '_cm' directive writing 3 bytes into a region of size between 1 and 32 [-Werror=format-overflow=] printf(ioc->name, "%s_cm%d", ioc->driver_name, ioc->id); ^~~~~~~~~ drivers/scsi/mpt3sas/mpt3sas_scsih.c:8884:21: note: directive argument in the range [0, 255] drivers/scsi/mpt3sas/mpt3sas_scsih.c:8884:2: note: 'sprintf' output between 5 and 38 bytes into a destination of size 32 sprintf(ioc->name, "%s_cm%d", ioc->driver_name, ioc->id); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Making the first string shorter is sufficient to avoid the warning here, as we know it can only contain either "mpt2sas" or "mpt3sas". Signed-off-by: Arnd Bergmann --- drivers/scsi/mpt3sas/mpt3sas_base.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/scsi/mpt3sas/mpt3sas_base.h b/drivers/scsi/mpt3sas/mpt3sas_base.h index 099ab4ca7edf..a77bb7dc12b1 100644 --- a/drivers/scsi/mpt3sas/mpt3sas_base.h +++ b/drivers/scsi/mpt3sas/mpt3sas_base.h @@ -970,7 +970,7 @@ struct MPT3SAS_ADAPTER { u8 id; int cpu_count; char name[MPT_NAME_LENGTH]; - char driver_name[MPT_NAME_LENGTH]; + char driver_name[MPT_NAME_LENGTH - 8]; char tmp_string[MPT_STRING_LENGTH]; struct pci_dev *pdev; Mpi2SystemInterfaceRegs_t __iomem *chip; From patchwork Fri Jul 14 12:06:56 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 107783 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp888283obm; Fri, 14 Jul 2017 05:10:01 -0700 (PDT) X-Received: by 10.84.178.37 with SMTP id y34mr15913568plb.223.1500034201584; Fri, 14 Jul 2017 05:10:01 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500034201; cv=none; d=google.com; s=arc-20160816; b=vNKP9EDPUizUrfsBGCUDq+NaLRF9Gbc75E4Wq/bmzpR43ZxCUXOYsN2vSRK04+m2rt 5WknMenzixzhBdPHZDV6zb4hJVAROlO1/HJdwl0FQYyhBiea1AnR1mH/ZFSInEnFUPqY i9MqDk4+crQ3SCY8ONxfb/hV/LRmQU/J8FeI49YCWmsd/vkc/66BGWU7W1X+pOyfmbdO PFDicY46KxG423j98NqNO6bZgr3XQzMIAFVSb6E/KzxyBE7j42FoqUKtKljJKM3w1lF2 0GkP81qFXM0FkzxlWGHWBfP0kCuhQprBSh/gxhKdliX3SNAI+2tieDmdKGyxOOW6jBDw gNCg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=pfZXks67rIQ9wxOYRMVEPF4w/SClc/Uy3CWqbkpLjYc=; b=lCRgGiZbgNru2VTShhiCHutLtdW4h2JyN7LHHyzLS6kE2tgy0OO+MmkppZiYOLtEgL KhyqRObMkZ/oqTwXIESGM5vGI3IyEQACfPMvQxXNmE9HA9eZ4nm/sOZDfn4Av3aziUTY xST91eoUfFMGVOEr/YzyJIwoinOFxX+VhFrTqnAQKkyvR8FXhL3mh7kevgvpjIhhcVwr Bn1MT1HZt2BYLo4wbtZ/3/3e0xTEz1hRsvDxEmZgo12VtnVbHQNlEOGisikfiAJLmMzh QqZBxewA+oynKqYJSiMGZJn0m7yHZhx6UDDu8txuX/XtuSjCCSXebm1Sl7qkpyXePqF5 nEaw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id g34si6873010pld.318.2017.07.14.05.10.01; Fri, 14 Jul 2017 05:10:01 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754112AbdGNMJp (ORCPT + 25 others); Fri, 14 Jul 2017 08:09:45 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:57895 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753830AbdGNMJm (ORCPT ); Fri, 14 Jul 2017 08:09:42 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0ML7xp-1dWGVc20w5-000OMY; Fri, 14 Jul 2017 14:08:25 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Sathya Prakash , Chaitra P B , Suganath Prabu Subramani Cc: Greg Kroah-Hartman , Linus Torvalds , Guenter Roeck , akpm@linux-foundation.org, netdev@vger.kernel.org, "David S . Miller" , "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi@vger.kernel.org, x86@kernel.org, Arnd Bergmann , Helge Deller , MPT-FusionLinux.pdl@broadcom.com Subject: [PATCH 04/22] scsi: fusion: fix string overflow warning Date: Fri, 14 Jul 2017 14:06:56 +0200 Message-Id: <20170714120720.906842-5-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170714120720.906842-1-arnd@arndb.de> References: <20170714120720.906842-1-arnd@arndb.de> X-Provags-ID: V03:K0:UVzIsmaXaNQf4a2OpU3fXVKy43BKdOotfKbDtnh14Jcqh6/VxDn ox3Z2cCdf152REUYsL+3a0S3B59oGUgqo7uXzglfAkxT4HNreF9tM0j0xroeskpmmQcuak4 PJciPnNDqoyx/2bQmuGNxCaXRR/J0eRgGu0CIx40W7OTDZEnsyQ9uiQJ6WH6RIukKe0YyPH EdbnmE6vRgCrdvxhfcrSg== X-UI-Out-Filterresults: notjunk:1; V01:K0:5qEoCJeY+RM=:mn7c3G7v9YUntR/ywz908Q yZe33rqWmN93yH6EJ74C4vkOfztji7vcgqgRDazBk17G5MOPn0rKWzD+KR8o0/w8MC2ONn+jk 6NdRGjAqOOBl+sF1thISYTPbVQ3IxQgm9nJU068/ArPp7HDfXRNBfHOAXsVLNZYzk1Uvl5Zlj 1NlHlavEqzjcZldaHgpiMaogSnY4T+WDX1tTD7kWfgfNNsp+towpj7wd+nBN6qkywiaNcTE6E K/1F/aEDqpPOL3Uslj3UaPgP8Gg6590M3Eu0qkHDR1e3POHYx3Sp0vzuVH/A8ICLu4HKfYTXz D+d5+6IOVYiNXjfqvdwADvebbzpZepbEG5AShy/s/ilwM/RWn04pMszkfaZYp+x9+sQ+Wmjxb vjmhnrWGCQ0Mzbrlm69mFMXswcsXteNGDiQEjbgQiyAwXUi1iaXldv3T7wFuzC4yNgAf7n89E ROtR784HNAggbn1DpgjWyS2XfgpA4Naf7pa715e4+m2QPybbdTEwbwPqYzlu3uErg8Oghj5Qd TWOpwZujtnX6VX2sU4Jw68M1KNWTVLiLaSu0/x9qTu2be5NVHkXNnfy1DLicKLxvCCSYgS8JL uGEUV3ZzH1Ndxp9s1pyQqPOazYWwElxWntWP0oq+f8V37tX/Eu5kwAJto1Sy0ryk6+vzwpEIq P+Yx6JZVKGRZbpmUK5DObRK97khycsfWGkxc51+qPnrNzXd6G3Dt/SRh4JEf1Hp7GuxMCgXoq gciS8hXZLT/7PjGh7838bHpq4tdL3w7EmyliMg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc points out a theorerical string overflow: drivers/message/fusion/mptbase.c: In function 'mpt_detach': drivers/message/fusion/mptbase.c:2103:17: error: '%s' directive writing up to 31 bytes into a region of size 28 [-Werror=format-overflow=] sprintf(pname, MPT_PROCFS_MPTBASEDIR "/%s/summary", ioc->name); ^~~~~ drivers/message/fusion/mptbase.c:2103:2: note: 'sprintf' output between 13 and 44 bytes into a destination of size 32 We can simply double the size of the local buffer here to be on the safe side. Signed-off-by: Arnd Bergmann --- drivers/message/fusion/mptbase.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/message/fusion/mptbase.c b/drivers/message/fusion/mptbase.c index 62cff5afc6bd..46b67a67edc8 100644 --- a/drivers/message/fusion/mptbase.c +++ b/drivers/message/fusion/mptbase.c @@ -2079,7 +2079,7 @@ void mpt_detach(struct pci_dev *pdev) { MPT_ADAPTER *ioc = pci_get_drvdata(pdev); - char pname[32]; + char pname[64]; u8 cb_idx; unsigned long flags; struct workqueue_struct *wq; From patchwork Fri Jul 14 12:06:57 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 107785 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp889459obm; Fri, 14 Jul 2017 05:10:52 -0700 (PDT) X-Received: by 10.101.73.72 with SMTP id q8mr14266066pgs.219.1500034252727; Fri, 14 Jul 2017 05:10:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500034252; cv=none; d=google.com; s=arc-20160816; b=KeAcM9sKFxb4Opy2/oGHCIZIowZDjfZEyjmHY3zBgcVpbcA9ntUoyyDJeiTfKRHZHa kb2lXfZ10tV1KJ1MHL0dG3ZSfNVvwBs/lLR3BI6sqgxMLMiipftrMafTXiaxG158+Wra +pKWS9UdZ8ew+Bdd7uAhhgYCMouPQm3rEpcsiQxmyIMB4Tr6Qp+IPauNLvZVjf7KdXCe sd3lC7Zvky7eJwwvn7Fgb4RS9eAtYp1Y8eBRHGANhHAoMgpwT3FABXjyiZlsT2a2LvM8 wQMCQY5t4Xo4nIYJDJTfA/IB5bsrx+PRXuk0le069bFZoCCjXaG/3nGT6KBrtCwq5/zR CAEA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=WdO0/WzePDkJBymIpCPcqTeGfCig6MoWbpMlC5iT37Q=; b=PGMFvW9qn5Vnre8W2wXpmxBOJvQTrGvY5Mt9lz1iixaWwDZnrA7WTd0lraZ1v32AvY Sh16nzsc5RJoSY22N6jBsPnlX9pjQzHyisHeneFiRTLp2OtFljn1TOx4R36neg30crOX 9U1sKtrDbPviRnHjjClmM7IzN6nHO0aBKUKRHa1TizmlVAO1me6zx8cIOy4o4g6dHh7G vrczPw7us24McQg3imY+DHn/7vrFPp4aMVgLC0RNKWP3MHb87Qx4/Dii/RHxfrNeptwJ e+5B2D4jzudz3CjiAm4iCOlbd0Vbrbh8xcxf1r3bHEG1oVnLzRFMkgJDnp4626mGG9Ce zJyQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 129si6520497pgg.111.2017.07.14.05.10.52; Fri, 14 Jul 2017 05:10:52 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932195AbdGNMKa (ORCPT + 25 others); Fri, 14 Jul 2017 08:10:30 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:49241 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753573AbdGNMK0 (ORCPT ); Fri, 14 Jul 2017 08:10:26 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0Lwqoy-1dgsSK2vPM-016Lzr; Fri, 14 Jul 2017 14:08:44 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Achim Leubner , "James E.J. Bottomley" , "Martin K. Petersen" Cc: Greg Kroah-Hartman , Linus Torvalds , Guenter Roeck , akpm@linux-foundation.org, netdev@vger.kernel.org, "David S . Miller" , linux-scsi@vger.kernel.org, x86@kernel.org, Arnd Bergmann , David Howells Subject: [PATCH 05/22] scsi: gdth: avoid buffer overflow warning Date: Fri, 14 Jul 2017 14:06:57 +0200 Message-Id: <20170714120720.906842-6-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170714120720.906842-1-arnd@arndb.de> References: <20170714120720.906842-1-arnd@arndb.de> X-Provags-ID: V03:K0:l9FMPrIo8toW5BJst/gcDIam8TLISYV4WMlqB3ERTHk5xHfU8uu 6ta5YmJaPQMLnnwer3eHQOLMIT3zvhbwHGDXlti2yDt+T4uvCB90KyyFCZCNLnywP7JsvOY ypjtDN1HmiWS2Ydum8XA2euNUtHiOiaDTcN+dem6lbZWvtrNw9iqWDaFcfvtxqeOX83SOqg dXyDWbgBim09eS2WjbWqA== X-UI-Out-Filterresults: notjunk:1; V01:K0:JTypZEVm0Dk=:5UV94W3HxB3mPysTuiacRe aoCDJ7JNkTZCFYMiMrh4s0flw1oiE2SgNC4t3LGUWtDftSZfknOXGJmgfwuCoL8Da7pxjpJgD c79vYuT7z1AG2uvNdlK+X8faY/9azLy+Ecb5RmZ2Ee5hIWazEjB26YQD6yBHLk+H8h4SbKEAh NRxS4aX6UGR5IR1BPb31dYPPwYzZUV6RHgTbAoyJiM2EyAyFusPPqbhNDs+55wg3ZX+f/HuGD Su4jnUX2YbSydkIvg6BYK7j4QUlseNc6JHLVw9BlKr1pViJKQn6KU80b46KeB1kDEaZBvAeiG l+KCJ/f4yDLNaIOkNgd6+M27LYqSeEN6Wihs+lzpBbXYRQ+R1Gj/yL3J1fQ3KOW/eSItU1dwB SpdagimvYfSTvrE0ciadUbmxQQ+MLdQdG/R5NPPolCFvBsp1z3FiQHMTY5Mt1E9pHnnxBWriC 3pDiy2A/JlDrWfDShE5bi162hiMIyP1HG+1BiDHO5VKhEP2RMbvaM67KmVbgUIMi8IGw2iu7T 5X5uootFq7kHpj9P5DctRLDh3wZT7bAnSbEg17vN8RP54dA0tQWd1mITNA+1xRMFRZxE80wb3 cH7jAwiKvwD+zO3uhbuh7NoxclurOkKleto5H6ys9hYDuH+uQxmtOObMrix4SFGdQyMhvBgJH aJgzu/gkx8kg+IjjadkAhtvum8CrLfCv+SZ5tdQdBZVBut4JozGZht+uhwdQYV29yxmqZlZDB 8CsNji3wJpgcg+Yv2HY4N+Z3QMz0B0Uow/wE+w== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc notices that we would overflow the buffer for the inquiry of the product name if we have too many adapters: drivers/scsi/gdth.c: In function 'gdth_next': drivers/scsi/gdth.c:2357:29: warning: 'sprintf' may write a terminating nul past the end of the destination [-Wformat-overflow=] sprintf(inq.product,"Host Drive #%02d",t); ^~~~~~~~~~~~~~~~~~~ drivers/scsi/gdth.c:2357:9: note: 'sprintf' output between 16 and 17 bytes into a destination of size 16 sprintf(inq.product,"Host Drive #%02d",t); This won't happen in practice, so just use snprintf to truncate the string. Signed-off-by: Arnd Bergmann --- drivers/scsi/gdth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/scsi/gdth.c b/drivers/scsi/gdth.c index facc7271f932..a4473356a9dc 100644 --- a/drivers/scsi/gdth.c +++ b/drivers/scsi/gdth.c @@ -2354,7 +2354,7 @@ static int gdth_internal_cache_cmd(gdth_ha_str *ha, Scsi_Cmnd *scp) inq.resp_aenc = 2; inq.add_length= 32; strcpy(inq.vendor,ha->oem_name); - sprintf(inq.product,"Host Drive #%02d",t); + snprintf(inq.product, sizeof(inq.product), "Host Drive #%02d",t); strcpy(inq.revision," "); gdth_copy_internal_data(ha, scp, (char*)&inq, sizeof(gdth_inq_data)); break; From patchwork Fri Jul 14 12:06:58 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 107784 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp888919obm; Fri, 14 Jul 2017 05:10:27 -0700 (PDT) X-Received: by 10.84.129.71 with SMTP id 65mr15982755plb.183.1500034227485; Fri, 14 Jul 2017 05:10:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500034227; cv=none; d=google.com; s=arc-20160816; b=enugQqA2jqNtZ6iOZIuGvC3+0R5OInwP0lMh/crPQbhTUpltF4hoqhfqmDv6yaTDqf XlR1DfLp9+uAu6i1No7CPmEz2Ju8b/vCi1FAPmLMAJnmOosuMs+A2ekDrZaeJgXMLeHX RHBFIUTx6zfJ5YEGp/dfbvVQExMxZwbk5cK2PrqC94jY02Kb3uWR1C+3HI9oGneBk3lM 1PFAILwLf5zFCrcWA7LmQd7hIuFErUr/ka+t71i7T9gmvfl3Lbi2ix7ADAlIvtL+y6GO JwVYJg4aB3Zl3UcxpL5ShEAm7I1xfWX2a9dukGVgfzP0jeWDB/mF8EGcZzrVJ+vc+hL2 k32w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=czp2rtMrftSkyZai6xbFNQMXtNUdKJmCYi4bYRSOQIc=; b=K3VHQcn75jaKoPjdCozORte9A/XoHFEsjKbvOYpOyfSO2f+9gB/rkpTMTMlHOusGye A9qom7OFRLIoB35p7XIOqn3fIOFOUkUCfH0ZmiSjutRZu8omA5/Wp6uHwsygK7jKk4aW gFlwr/Bz3Q2pFvy3PWYr2fGRQbZhi/WYzH6RyppUnnzMraTaxEKccnfMNUCTzJ92TqOl O9o/A1eKwk3gbigDP4WpThXyyxFh2ijLN0T/xLzgE1SNpmiiWYqaUCpq+BicE3KNXcA1 u31A0L5iy7MdvPBlvf1D7BFtRsWOpK9VJp4gXG+NA6gbQLetk3b36FGCsHPXo1GOXqU6 X5tA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f2si6374184pfg.259.2017.07.14.05.10.26; Fri, 14 Jul 2017 05:10:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932180AbdGNMKJ (ORCPT + 25 others); Fri, 14 Jul 2017 08:10:09 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:63447 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753573AbdGNMKF (ORCPT ); Fri, 14 Jul 2017 08:10:05 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0MMnSJ-1da6X11woZ-008eE4; Fri, 14 Jul 2017 14:08:56 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Satish Kharat , Sesidhar Baddela , Karan Tilak Kumar , "James E.J. Bottomley" , "Martin K. Petersen" Cc: Greg Kroah-Hartman , Linus Torvalds , Guenter Roeck , akpm@linux-foundation.org, netdev@vger.kernel.org, "David S . Miller" , linux-scsi@vger.kernel.org, x86@kernel.org, Arnd Bergmann Subject: [PATCH 06/22] scsi: fnic: fix format string overflow warning Date: Fri, 14 Jul 2017 14:06:58 +0200 Message-Id: <20170714120720.906842-7-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170714120720.906842-1-arnd@arndb.de> References: <20170714120720.906842-1-arnd@arndb.de> X-Provags-ID: V03:K0:AUW5c3mSXTSMFJD3X7qOLGQOyqS5fTSIKfLFi0PJh7HSONdJ373 2VlhNiULcHTh6Z/U7DDv7EHeZLOJUyJ+UdT42R3Uh7FZCSiuXc3ef5B6xT9hy3y415H1DbO r0aXVxk1IDpB08IDdoIefmGfOLiAEm/hmsOGA2wlSkHltuzBj4BhY7HQWuOu4yRpmoKCx05 q1A7TEaaFFdlbgvD5ve2A== X-UI-Out-Filterresults: notjunk:1; V01:K0:vx6N5lFRUsU=:Ihl63tpDqES3qT4X6sb8Mb jK/CQwD7LB4ZQio1XKi4XAYYxU1ecXuKjK0XcDjINtM81pYCHnPUkeIEcjh8tWNMChNk2hm5K u9g+ehbhgecLRnKIbRs7rSmfZ9jv9HZYWu+mZ/BHOgkaBFhL0jKAE8SiH6JIi997PSkk+6Zng 33uB3jFgYQOZUG4qQbAP99M+DeskTuqUWMYUPt4+9ctUoFk1vhbu3CSrkdvyQmiKX2TVI/TAH rPKRVP10vPQ3O6xu4lhuj9wRbs6mGnngFzGBnnk2e2g2EGBRhHieJGx3BtWzMIh+2KBbcJuBK +LJmAtnFIoQQwjLZ4WpCWOo+VMmS+j8UlRNXzrrn58k0+DkONf3RdcME+98AKKg5ZfFZJPP+4 pDP32PMVPRb5va/+2j0fdr4RG7JtkOrbMIKfj7fkxDP0pi9UX+iNbwuHu2WwAZd8Y2Ca/DzMh 7f61klBJMxE7787but+dY4u+ldlU38hDFl5zB7R9Rg+q2jUZkBoZ8MY+Qr9Aalot/JgHNFkc4 r2zExX01+2qX3Gt4F4yoseQQfMJ3DdG7LOIZ4zs/yFOhaEozLVQOaoFBFMbj6jtEcm4jP0x1r JCgthbHrA81a/9b33HLmCayGGq+ZL7s1Eac167lBpQQLRiNEM+TAp0APRkoNYJmYrZIiN2Em+ dGlC0k0b4DwcMm/MHrw0kzIs1+zOnytsQ7w1EoEQOBNAMTdRPASMjOn/ueRrxCl/RLiRULoXS iM+hGv0AIUN4iy7yB4j64HrLIflBPlp/z4kTNA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The MSI interrupt name can require 11 bytes in addition to the device name, for a total of 23 bytes: drivers/scsi/fnic/fnic_isr.c: In function 'fnic_request_intr': drivers/scsi/fnic/fnic_isr.c:192:4: error: '-fcs-rq' directive writing 7 bytes into a region of size between 5 and 16 [-Werror=format-overflow=] "%.11s-fcs-rq", fnic->name); drivers/scsi/fnic/fnic_isr.c:206:3: note: 'sprintf' output between 12 and 23 bytes into a destination of size 16 sprintf(fnic->msix[FNIC_MSIX_ERR_NOTIFY].devname, ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ "%.11s-err-notify", fnic->name); This extends the buffer to fit any possible value. Signed-off-by: Arnd Bergmann --- drivers/scsi/fnic/fnic.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/scsi/fnic/fnic.h b/drivers/scsi/fnic/fnic.h index 67aab965c0f4..d094ba59ed15 100644 --- a/drivers/scsi/fnic/fnic.h +++ b/drivers/scsi/fnic/fnic.h @@ -180,7 +180,7 @@ enum fnic_msix_intr_index { struct fnic_msix_entry { int requested; - char devname[IFNAMSIZ]; + char devname[IFNAMSIZ + 11]; irqreturn_t (*isr)(int, void *); void *devid; }; From patchwork Fri Jul 14 12:06:59 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 107801 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp897590obm; Fri, 14 Jul 2017 05:17:43 -0700 (PDT) X-Received: by 10.99.94.194 with SMTP id s185mr14838551pgb.82.1500034663476; Fri, 14 Jul 2017 05:17:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500034663; cv=none; d=google.com; s=arc-20160816; b=H9gJ1kjvQ12HDrLy4IqfWeqtiJuiyUPSpGP8bPi1hMSftTbEOuUICWBMH8VNVQMNM+ U9BiveP7zIRYmNZ3y629YLYSlH2vtc7hmxEddgPuG/KXeCpQRogWuQeR/zxeHz+K3ere hXlRZ22B1Lv+1Zneu07ne9++i7uTZB1/YwnC71DHoaHUxYXlCevINDmN52VA6POcco44 pwX0eDz/kWlObDBxbWcBjqxPvOfsdEM5qpfWucYd+zLNF5Ju1Ov8AKqvVaXtgr6eExJD itmeTWQ2L8TvEWAH4D4Mb598eKP4DTFxPuEHjZfSD3jfYMGJ50vptnKfipsG/O5vm6U5 r5Yw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=Xy4HFD+7eSCkZv3FwJM8ZXk+P0HuxjcIH2pkUjtggIU=; b=CySuSkPRgPo8Lvsus5IIc0bhCuSjDmIyPwwiV/P+cKRgsbFhL5oG9vl5fWrQqZMR8k KxweFffQECqrVu/XmhFJtVpztTsvhpxg1m3+u918DwfBw6j/DU+ZRycQDaaDR6Ejh8cU anSlumDaV0Ysms9pgetYH3TY1wyvWwziqpZeSlS9vldjzkaNd4Ndtn/xF1kxjhOIlIT5 0ZS7mSRdjoeV9WZD3UlhEJhmMPyKqvSQiiqEgF0kB8dXiBvOXjmLmVKWW340GKjlngq+ lIWOdCr5iRu4/aHZY+aHWFFKUydjpsY0zWIWH1qFioHof1elbrTdEU04MgCyFGOGebnN ONKQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id x7si6510136pge.177.2017.07.14.05.17.43; Fri, 14 Jul 2017 05:17:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754052AbdGNMR0 (ORCPT + 25 others); Fri, 14 Jul 2017 08:17:26 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:56663 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753984AbdGNMK2 (ORCPT ); Fri, 14 Jul 2017 08:10:28 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0M1od8-1dlsfE0WcM-00tiwP; Fri, 14 Jul 2017 14:09:10 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Achim Leubner , "James E.J. Bottomley" , "Martin K. Petersen" Cc: Greg Kroah-Hartman , Linus Torvalds , Guenter Roeck , akpm@linux-foundation.org, netdev@vger.kernel.org, "David S . Miller" , linux-scsi@vger.kernel.org, x86@kernel.org, Arnd Bergmann Subject: [PATCH 07/22] scsi: gdth: increase the procfs event buffer size Date: Fri, 14 Jul 2017 14:06:59 +0200 Message-Id: <20170714120720.906842-8-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170714120720.906842-1-arnd@arndb.de> References: <20170714120720.906842-1-arnd@arndb.de> X-Provags-ID: V03:K0:b4vmksQ/9v8c2ubGZ2/juhgzRZwJ9ZyUQHa9fl68wCSJDbMN/iG JUBzKHqMCpga/I0bUrHnOIuya4nQH+PgnPlJ0YqWLfopxGDKNGDA3p0+CJmTcSccMnkugfc bwmMgJoO9CQzKzNxFW57brOJizmXHPJEWnfkK+rzM5h7ABerykChOAmaNhLN+3AhskVnvlQ FPum6+2DR26t6aCCXmWkw== X-UI-Out-Filterresults: notjunk:1; V01:K0:vvuHXynTeqk=:LKGYQZjHj+zHvaODUPOemU 7vJ6XETOyZUMtzMeDLmYeABAFRGGjHh78WFQJ3X3gJ+TU4WGOlbD1kQJ1mfA04kUJWTCimCpr vgun6VEGcQUpLz6yp06OobI4xaVOgK0kys4lF41aNDg/buHJWjDv6kGkpdUjiRQJVJu1eAZdQ xWxnDqJ9fOVHWdbqTBhRd0wjSC/hH0vltLyWxGcWiTL6OEepit6gFbNq6MZBQWevJklntAxfJ qRb1rxuhKjWCPQRyHvjGHwZIhCZz3YFrLeIlfu/qfeWm4La2ET7XKkcaAXnzL4qYmQt+xgDbv I+zaafzL/9oa1dvk4ZpqczrZjvdbJB5O51GXKWwa6ks7Yb8lLiiDKHZ2I2dfw3hCQDfeJQcwk FNOpfS/b1TjyKsQvJFm4cSGMnH4z1aVxC1zYK86KqzEmO/txyrP66uJaEGoXAIAx/hFLZjqWc 17vlZtbF9Qtv9a3REATPEuTihPprCU0YL0RrVSVZSB7M8pcqAaJBL5XjRDhFERKIktzeYjl6E UrEf8QupVElFPqFkj2vaHYS0A1zzw+LbFPfMBRsS3Ihf5gqnLO2/ucPPzwOUoO+Y2rEbdJa7M 6pE8sVRdZqfq4g0XEdywnUHjgp5EwA38Mj2+aLXgbr+6ZA5P2JjqQJefb05P5Vl619XgN6bL7 OW1S8t+iIvGaxovuMQNsgbsU/13iZVz72yrqHgcACPNMWAan1EeB241WalHvymK4k/WQtpaJw OxqZnS/CwPdEyhz5ulL37281qNXcXHlII1yXQA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We print a 256 byte event string into a buffer that is only 161 bytes long, this is clearly wrong: drivers/scsi/gdth_proc.c: In function 'gdth_show_info': drivers/scsi/gdth.c:3660:41: error: '%s' directive writing up to 255 bytes into a region of size between 141 and 150 [-Werror=format-overflow=] sprintf(buffer,"Adapter %d: %s\n", ^~ /git/arm-soc/drivers/scsi/gdth.c:3660:13: note: 'sprintf' output between 13 and 277 bytes into a destination of size 161 sprintf(buffer,"Adapter %d: %s\n", ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ dvr->eu.async.ionode,dvr->event_string); ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ gcc calculates that the worst case buffer size would be 277 bytes, so we can use that. Signed-off-by: Arnd Bergmann --- drivers/scsi/gdth_proc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/scsi/gdth_proc.c b/drivers/scsi/gdth_proc.c index be609db66807..d08b2716752c 100644 --- a/drivers/scsi/gdth_proc.c +++ b/drivers/scsi/gdth_proc.c @@ -147,7 +147,7 @@ int gdth_show_info(struct seq_file *m, struct Scsi_Host *host) gdth_cmd_str *gdtcmd; gdth_evt_str *estr; - char hrec[161]; + char hrec[277]; char *buf; gdth_dskstat_str *pds; From patchwork Fri Jul 14 12:07:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 107786 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp889997obm; Fri, 14 Jul 2017 05:11:18 -0700 (PDT) X-Received: by 10.98.47.194 with SMTP id v185mr5042010pfv.62.1500034278205; Fri, 14 Jul 2017 05:11:18 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500034278; cv=none; d=google.com; s=arc-20160816; b=tsxt7CjH/WzTSQlOFVifLtO1vpztyg0Q9u2wChBmt/bMZ5933yIsr09SiCfwnLrXhP RjEOjcccUMfP8cy4VJUTLWi2GSHgBdaxA4lh2xcmp2G46bCrF7hfbt8Yt2B0FSSnpu7q p2tW7cuLYPvwcqcasAcLQGIgCNYnO31lDqgNUg+zQXeYNxSF2JQzzHdMITEqkpdVogDu TvasY4jZJ2aS+SPLUm8qyRh+APHheQUHNeRLdRoVnExiVWfb5KsFqrg0pvjpo+eyMnyX jxXiNzJaUq4Q1fVjoYgizvb2YqE53AG6tBniAFKnroWWOnpU6OoVDLb8kpxYchWd4/uE ML7Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=FO2j005a0XxM1UTPCiKp5nYRS+xcr22RsTqQ5VGaTVg=; b=U9PyE8aSP9vsighXKCKFIz/Qb+moGKX7DiiEVf7LZJnVjnS9S7lO073HcqmhMVNmnS 56CdOoFecYjulGEg2U1AeYTfhxREohMrP2g63Qa6hg8qrLeEtaSuWCx5rU6ZI5AGhuLu qFWyJ+EmlNAAmLNp0nVivfo6bfeCPa67P0GtfuvCrMvujH1k72JCLp/+KxECmEQFkmmp 9Nk1CxQ5n8ClKz6i8gz/HFRT6TeGOv/mQcP3tVp1JzdFY+Vd1I/bvKHrlpaoUdAP3mjC /rW5/BQLmbwWlC4Tx6r9GdGBnVRhOWZT1GMNav/3mo/51xgEEDYi8nUZZtDE6LRJJrIt XieQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n19si6404893pfb.298.2017.07.14.05.11.17; Fri, 14 Jul 2017 05:11:18 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754167AbdGNMK4 (ORCPT + 25 others); Fri, 14 Jul 2017 08:10:56 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:59317 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753787AbdGNMKx (ORCPT ); Fri, 14 Jul 2017 08:10:53 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0Lnjkl-1e9AJD0C1n-00hyye; Fri, 14 Jul 2017 14:09:28 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Karsten Keil , Geliang Tang , "David S. Miller" , Arnd Bergmann Cc: Greg Kroah-Hartman , Linus Torvalds , Guenter Roeck , akpm@linux-foundation.org, netdev@vger.kernel.org, "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi@vger.kernel.org, x86@kernel.org Subject: [PATCH 08/22] isdn: divert: fix sprintf buffer overflow warning Date: Fri, 14 Jul 2017 14:07:00 +0200 Message-Id: <20170714120720.906842-9-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170714120720.906842-1-arnd@arndb.de> References: <20170714120720.906842-1-arnd@arndb.de> X-Provags-ID: V03:K0:jGC1CMG28/iTtuI7HY0xqX7ZOWjXUB/brD0xL7o1swOJ92a9DwI vzv6XQlNuH2ctRAl88Apw/RJ2SrWEKAIZBYFAXp12mZBMLzp+R1yBrZDsiY7k3gaVMlALGG MviO/BaA3f/l+JMFOAJQvz3nI9Voueo7KY/3E49asvzkyv3s2GfrhynO4vxyD2hN0N+qIPs Aigck3AimSw5ZBwK1qWog== X-UI-Out-Filterresults: notjunk:1; V01:K0:uhVPpDTwJSQ=:4zL6AJ5xCRzze1G0OKJsB7 CgaTtKUIE7XY80NFWlH6iQ9UBlnbEwthRjD16XUvY3sAWgFMWgc+IVRhtI9nCAK18PmyM9y85 p+kxb+lQq0PkYEA+zz2XSTqJSBy383/NCKlcIA0rn4QqAf1if63f4zwoxcf3OvvSGdQ3hejQZ 5AZxmoydVye/7Q35VavLx/6kFKJOA3Snf4sXn9ZIp3QeE+O3p5RXj9Pyrg5txDNNE7Ipr2o9i OtoZ1Idg/AhdCh8kGq4Nc+FZFzW3P8V/sFn5E5F49wqWG8Hb1JW8cOL19CdN3UfQxGdEheT9i N6OHQpqGX3vBAkr5/ASHwfUyOiKdQ00OYeOeq/nsXg+xX7qoqrulD6sJtCUC9gjcFl5Mojx8m eNPHCL+N1wInbf31ix+FMFK3hkjg01lRkSdKS7tIWjAD7soTPnnwM5rMXm9eBh26NqA2ssiKr xPV25Uf9BSmwtYd0iB03IWfMXswHIVn8R4tyVLblOdDdLBmygMBxGyuPnn7JnwDhn1Oeu6npa wydI2lJ2Fgy3uszoANp+1bH4Q+dcCX7ndIje6ndrxRiiABsJAkNAhuPd6YsrHIWXQ+Zbu4KZ6 SR9LDhsuCBn6kGYsjOpwbezcXShmyI7vtxWQuQA2rUR1dVqD7FV3f+Z5d0LfQN9YmsCEi3YWy zfDv2mS5xL6gC23ce678jbi+8BW5eOIzQUnvFq0GxZkSeA2chn2BV8BgZxO3d1CxxMXJzyBVF GlEHbT97BW0MdlEqWZBQ3GQnKTuQD225b+IDew== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org One string we pass into the cs->info buffer might be too long, as pointed out by gcc: drivers/isdn/divert/isdn_divert.c: In function 'll_callback': drivers/isdn/divert/isdn_divert.c:488:22: error: '%d' directive writing between 1 and 3 bytes into a region of size between 1 and 69 [-Werror=format-overflow=] sprintf(cs->info, "%d 0x%lx %s %s %s %s 0x%x 0x%x %d %d %s\n", ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/isdn/divert/isdn_divert.c:488:22: note: directive argument in the range [0, 255] drivers/isdn/divert/isdn_divert.c:488:4: note: 'sprintf' output 25 or more bytes (assuming 129) into a destination of size 90 This is unlikely to actually cause problems, so let's use snprintf as a simple workaround to shut up the warning and truncate the buffer instead. Signed-off-by: Arnd Bergmann --- drivers/isdn/divert/isdn_divert.c | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) -- 2.9.0 diff --git a/drivers/isdn/divert/isdn_divert.c b/drivers/isdn/divert/isdn_divert.c index 060d357f107f..6f423bc49d0d 100644 --- a/drivers/isdn/divert/isdn_divert.c +++ b/drivers/isdn/divert/isdn_divert.c @@ -485,18 +485,19 @@ static int isdn_divert_icall(isdn_ctrl *ic) cs->deflect_dest[0] = '\0'; retval = 4; /* only proceed */ } - sprintf(cs->info, "%d 0x%lx %s %s %s %s 0x%x 0x%x %d %d %s\n", - cs->akt_state, - cs->divert_id, - divert_if.drv_to_name(cs->ics.driver), - (ic->command == ISDN_STAT_ICALLW) ? "1" : "0", - cs->ics.parm.setup.phone, - cs->ics.parm.setup.eazmsn, - cs->ics.parm.setup.si1, - cs->ics.parm.setup.si2, - cs->ics.parm.setup.screen, - dv->rule.waittime, - cs->deflect_dest); + snprintf(cs->info, sizeof(cs->info), + "%d 0x%lx %s %s %s %s 0x%x 0x%x %d %d %s\n", + cs->akt_state, + cs->divert_id, + divert_if.drv_to_name(cs->ics.driver), + (ic->command == ISDN_STAT_ICALLW) ? "1" : "0", + cs->ics.parm.setup.phone, + cs->ics.parm.setup.eazmsn, + cs->ics.parm.setup.si1, + cs->ics.parm.setup.si2, + cs->ics.parm.setup.screen, + dv->rule.waittime, + cs->deflect_dest); if ((dv->rule.action == DEFLECT_REPORT) || (dv->rule.action == DEFLECT_REJECT)) { put_info_buffer(cs->info); From patchwork Fri Jul 14 12:07:02 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 107788 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp890509obm; Fri, 14 Jul 2017 05:11:43 -0700 (PDT) X-Received: by 10.84.213.9 with SMTP id f9mr15499010pli.22.1500034303737; Fri, 14 Jul 2017 05:11:43 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500034303; cv=none; d=google.com; s=arc-20160816; b=NQgVGaKAwKho+30BpKf1qpw3gLU0Hi0T0RYOqxVPY/mzRCrINw8jmZEUCsmj0Y0peP O9B0Gqq35bYxjfTJpsIkCRn5QUwElQ6/7UCDK/QEL80NZJmLIN5mlkLoyYn+0Wef6oxl aUxYg7hzFFnB+ZxTNmoAW2WyyJgIkgPyZUyStefKuamnyJuOy7aMDXKzj9beYNA3O2Xo GE6BrzfJ0TvRJkkSyLqC2jNndScG7dXZ+KPzKqrGfkvX/PlwhJFT2qpuwld9Os6QflKl YNBLr9lrOmSMbHN0DzSztqa4x8EtGsIdEChDCQgohdnCPHUQkl47fqtQx4VFCAMWcivQ VGpQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=xYmXynSj/pgXREBne+MOISYsbF3pLQCtiuMJf7EOyxY=; b=HeU/Wxt6F+yXVxJ+mor8yTJejXKHDutJ7696UYAp/beM/RBLF0L+DogkDM/+2HK77v isPpYB64oBKJzVI6Rbz12MbpIynMfirxRFM62gNN9faHicbSkfqM5/lf9hNlQogM5+vy bHJPkbPLx362pv5sUQK/Dp/oE9XjtGJSJ9Bd85M3pdoJOeTkNOBUmH9PWmbfN2jcK1nG tyBy2O9LMZHvQAuy0/IaGL0U9KKEg8leokBb6Oc6YeMN+t76G3L19J0Nl+FHh1yR9s0d VayxNcXlAbYyKVhPzwK5OaOE0pR0pbJ+EN0UrRtoAkxpjXOrwFEapcMkbVx4aYZ02I2f B4lg== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id l191si6428943pge.205.2017.07.14.05.11.43; Fri, 14 Jul 2017 05:11:43 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754211AbdGNMLh (ORCPT + 25 others); Fri, 14 Jul 2017 08:11:37 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:65148 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753787AbdGNMLe (ORCPT ); Fri, 14 Jul 2017 08:11:34 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0Lu4L0-1dgKkB2QdS-011OS1; Fri, 14 Jul 2017 14:10:01 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Yuval Mintz , Ariel Elior , everest-linux-l2@cavium.com Cc: Greg Kroah-Hartman , Linus Torvalds , Guenter Roeck , akpm@linux-foundation.org, netdev@vger.kernel.org, "David S . Miller" , "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi@vger.kernel.org, x86@kernel.org, Arnd Bergmann , Colin Ian King , Philippe Reynes Subject: [PATCH 10/22] bnx2x: fix format overflow warning Date: Fri, 14 Jul 2017 14:07:02 +0200 Message-Id: <20170714120720.906842-11-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170714120720.906842-1-arnd@arndb.de> References: <20170714120720.906842-1-arnd@arndb.de> X-Provags-ID: V03:K0:c1bSjVs/2GMQQiT68q3qy+sPqeH3FzltEjy9ppcUrZNtbPrRJql 2xRWAZ8BCpVzdP++5F7+Ee8Wu6GTvsufzftnFKNwhwSsBd/UoQOcXlcnCKcrCd1i+dnzAvk 8yHMpLwfwziYDQM/0RiEdmkPBwshU2YbN+hrHwEaSXSAHHzTyPkW6OrAlKl6gEr1ee9NYZK ZaQk8NHv6vS4nhgattWVQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:L1CZd1kqvUM=:5oXwQIipJPnhYLdftUY4Yc p+lSBYrzTKGgFHptjYeCxsniqQrvPCDKyo8EmbEFWfxqeN9i7oBx5gykj5Ey4+p8j/b4ShzCs bC9EjCS6Po1KfT6nXfNGWp3e6qdaaPy+Vr97a14A9sXFpUjqA+hNS5RRJ6azh9OL8maZk4KwL l6s2BSeYdFVerLQUH+YyFW/3Hv2Hcspfp5u9Gs5VwJHFRJuaZig0j9tZf2ihFYWp5DNUjETDw Oo42KT9fyKI2CRuqnx71qv2lgyAND67dO8QOJFUy0Zli5wO/cG7LRS5OOW9r85lioSTau0+Q2 iwlP9zOrrx2l8LakuRHpWqYsMbLqzgYTQ+znm600UQhE1x6QGzqSGjRB5+9et9CPUtMvv5jm1 tcnXopc+Ibd5JQ0M9qfRTbnDyguIWaD6yHblLs5xYPBw8GK2RaUIksvcdlDF4Q+02ceqrC+vn 8XUS50tGogEg0bNt/tgrnUj6OLMWqTy6hArd9tle5vNTuKEXX7Loq88gQ8Ker8gOvNr4Q2rop xDpXiQ0P+pABGm0n7vX3CVBS80OY7CEUutujDhzHr34EI8JZ9Al6uv2H7gWXLdi4TUjvwYtw6 NwcQ4DkJRU91MYd5m9VXWcSUbm88MzPagk14HNlf0BiZtwwRQt3scC9juv/Ijn5ZU8wpFcoWZ ORfrMuIRQLlkvOsYVN8e8JpoYWarMobjTQ7thgawjfD29NeNIs9xz3gT+o2W1SXh/KRpRCeS2 o7AdhL4eq/WX7VMJW2LAKcR0Bz9PRy4Dfdu5Ng== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc notices that large queue numbers would overflow the queue name string: drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c: In function 'bnx2x_get_strings': drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c:3165:25: error: '%d' directive writing between 1 and 10 bytes into a region of size 5 [-Werror=format-overflow=] drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c:3165:25: note: directive argument in the range [0, 2147483647] drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c:3165:5: note: 'sprintf' output between 2 and 11 bytes into a destination of size 5 There is a hard limit in place that makes the number at most two digits, so the code is fine. This changes it to use snprintf() to truncate instead of overflowing, which shuts up that warning. Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c index 21bc4bed6b26..1e33abde4a3e 100644 --- a/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c +++ b/drivers/net/ethernet/broadcom/bnx2x/bnx2x_ethtool.c @@ -3162,7 +3162,8 @@ static void bnx2x_get_strings(struct net_device *dev, u32 stringset, u8 *buf) if (is_multi(bp)) { for_each_eth_queue(bp, i) { memset(queue_name, 0, sizeof(queue_name)); - sprintf(queue_name, "%d", i); + snprintf(queue_name, sizeof(queue_name), + "%d", i); for (j = 0; j < BNX2X_NUM_Q_STATS; j++) snprintf(buf + (k + j)*ETH_GSTRING_LEN, ETH_GSTRING_LEN, From patchwork Fri Jul 14 12:07:03 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 107790 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp891189obm; Fri, 14 Jul 2017 05:12:18 -0700 (PDT) X-Received: by 10.99.115.66 with SMTP id d2mr14656723pgn.10.1500034337921; Fri, 14 Jul 2017 05:12:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500034337; cv=none; d=google.com; s=arc-20160816; b=APFwk/4qmcQWnls9xmE/YMprWv1I+ip/r7P/g3B+fNppOIQ4zJX/PCh5iqUar7xZEg oKdR8xDNQbzye2gjIOD20VCTzgBGtbvNx6IkCrOmgSHPoonZEsXC1Re1/1wS2iB4c7H5 fGW8tF4C+E1hriXXgJYsYzfvavdIgGP1EOK87YqTRIOAKV5z5NFTxwCErULGvSeHuX87 R0ED9LBJb55/gTPe49yKvPJn02QALEn59I4RDaFNtkwvb8erDaY51kZvPX7LeawoSJey d8zj9LqyrEmu84OM4mqKHxBJSrMDlAE0N6rzPltbTwlDpE9dS16n80vGohKTeHRvcUpe /zvw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=U6nrofor5p0DmjbRqpHY+xiMblZVGXyuBmUDDbWOFFs=; b=bO/+7uvB4H8P1BcLg+seporz0Z94/qaXu0ulrebQiPgniZ3ddlU5msrUaAXc9FY/wQ qbVVVYHNI7a5ZnjFP2oYgA8kNZmYy8czLdpSPTFc9mkQ95xI9SuhZXcG5Op0cxFhkWaS /S8uZiZxzhpeJkOhhRh3yZE8VOd9vh2YYzSZe/LVinOgbW4A9kl3PQ+Ye+FYsSBN0X9c PVdcz3/9rKCtjnWDbWeRtSbMRzNFvzgnRmPweiBW3uwm5Fc4tjEp4JzRpue+G/YKlbkY ebgtYknDvv7l2wqSBBlSTFsizpzCwvsZXx2L6BjbkcKFzQJISfkpTyxWDvWZ6WrPix5c Fk0g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 65si6730523plb.307.2017.07.14.05.12.17; Fri, 14 Jul 2017 05:12:17 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754224AbdGNMMF (ORCPT + 25 others); Fri, 14 Jul 2017 08:12:05 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:51173 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751392AbdGNMMC (ORCPT ); Fri, 14 Jul 2017 08:12:02 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0Lucpk-1degZJ0h96-00zkIB; Fri, 14 Jul 2017 14:10:13 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Sunil Goutham , Robert Richter Cc: Greg Kroah-Hartman , Linus Torvalds , Guenter Roeck , akpm@linux-foundation.org, netdev@vger.kernel.org, "David S . Miller" , "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi@vger.kernel.org, x86@kernel.org, Arnd Bergmann , Thanneeru Srinivasulu , George Cherian , Vadim Lomovtsev , Radha Mohan Chintakuntla , linux-arm-kernel@lists.infradead.org Subject: [PATCH 11/22] net: thunder_bgx: avoid format string overflow warning Date: Fri, 14 Jul 2017 14:07:03 +0200 Message-Id: <20170714120720.906842-12-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170714120720.906842-1-arnd@arndb.de> References: <20170714120720.906842-1-arnd@arndb.de> X-Provags-ID: V03:K0:IXkVdlkrGd4gRR1l004nsDZDHsJCZogj8lLqo+ket4PT6i6j4So ZrlGb0Lr7KjpTnAvHSl3UvfR89sScvb8u8sfyrOCckH9h6m5pNvnncQOQ22udefMgXWXYLq B9htEtP8y6kI3GVn9qnXa/YfSDBviYY+azRwOaEQdEYnhhvf+5CFwWY0FWurl8Woe/sf1hd GPimPSFvBH2YKGR+Ta/HQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:xI/tuusgwSs=:HZEowIDYy7v5MokrN/z9d4 +fflzhBCSBCtiZ872Qoio+eraYz5hNSszhppDpNKndvmZXHkHyPnEF4zKkVr4jDWSkPFnjbBs 3nHfbUa2JhGW/wA42qEWX5ph97iwtzXy3fx7bbl+xVnVdVpg8m1jg0P0wVdRu8w9p6mHGK/zb hceCjGMHXJ5VJM5pLtF1B6KX/sTVHh/VG5RoKm+TI6Q51WcnA9uS+GfaDDmptgTrq2ASq8twd FSokNWOU38U9elPUuH02Tp8R6l9fTct96obJTPGrm64T6uIVQ3fdWsxd5ymkH+dT4ZULnLtBM DS3FaveCRlv7YFtXE+4Gy8qBzsK+S3A97/qr5VASnaKX9pY5kPvt01yQNLWd8t9S7YkGG1hho anuloYgQiEhZVosCzSP1EtKON9jZq+Dj10SmXEcNovGJZeP3ROd1UrAra5iyc+dHyrQqwAtWv VcBk+h09NcI4d4EYdjwcdlapleCkl3ulVxVHQC4tbbSKH/Ktz7DYa3iJIHR8mLXHl/IM9wLo8 pENknVXsfrc1KGoE6s6INnfldtc+fxFUdpv1qUYZRQBVpbt0TK60UEkjrFf3zupuWp0F18PbB OvdrBzAKkNPSX3v4jmK99aO86dHvaBsaKxf2KGHobdxCiLcdFcXSkVR1y5F+xLCMY9v79lYUr SdfZJTnNcQI0+xZkRn4d/UYf1fVeJI4SLCOwrn0tAv6bz5jT71/9EAWYA8azHsWRMKWuPo6UW Gf0GFi3n8nUP5Kc+bscabBYF84FaIkgN7fhvzg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc warns that the temporary buffer might be too small here: drivers/net/ethernet/cavium/thunder/thunder_bgx.c: In function 'bgx_probe': drivers/net/ethernet/cavium/thunder/thunder_bgx.c:1020:16: error: '%d' directive writing between 1 and 10 bytes into a region of size between 9 and 11 [-Werror=format-overflow=] sprintf(str, "BGX%d LMAC%d mode", bgx->bgx_id, lmacid); ^~~~~~~~~~~~~~~~~~~ drivers/net/ethernet/cavium/thunder/thunder_bgx.c:1020:16: note: directive argument in the range [0, 2147483647] drivers/net/ethernet/cavium/thunder/thunder_bgx.c:1020:3: note: 'sprintf' output between 16 and 27 bytes into a destination of size 20 This probably can't happen, but it can't hurt to make it long enough for the theoretical limit. Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c index a0ca68ce3fbb..79112563a25a 100644 --- a/drivers/net/ethernet/cavium/thunder/thunder_bgx.c +++ b/drivers/net/ethernet/cavium/thunder/thunder_bgx.c @@ -1008,7 +1008,7 @@ static void bgx_print_qlm_mode(struct bgx *bgx, u8 lmacid) { struct device *dev = &bgx->pdev->dev; struct lmac *lmac; - char str[20]; + char str[27]; if (!bgx->is_dlm && lmacid) return; From patchwork Fri Jul 14 12:07:04 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 107789 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp890713obm; Fri, 14 Jul 2017 05:11:55 -0700 (PDT) X-Received: by 10.99.121.77 with SMTP id u74mr14383957pgc.107.1500034315740; Fri, 14 Jul 2017 05:11:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500034315; cv=none; d=google.com; s=arc-20160816; b=VDXzTQdp7Wnhd6KDQLmaBiX0R/StYuu/xuKdSVUn9kS2g94AsR3ip7KR5wpgDqbqhD YR6z+mXCuGYvWDr61nbO+Ebf/b3UsEvfOHwVx3VsLOZ3I/j7+s5awvtIXwbs5Vux4lJH MUIjywXDZGfWBorPz8miJEAk0XGS7pL9bGYxE6b5d+wC0qfBlgAIKzPN35Yd5fnldcUH sGWp7cSfQ30+xQZRizuPdnFZHjl2h0hDHMnRT+Nn8EQb6DKQNVwy9d9lRvgw7PD4GBLT 3BIA1eD41NRoaMXbJDMILhqv1JIFIq3cu2CLw7Kd5Rqkuj2cEq5C7eTnHCqXMzfQYbrG 1R4A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=d5uF4os3gopoODiJiEacNZbhaOgfo9g1Y2mbucjhNMc=; b=HnNkSou7CjlER3gJDgqK0GHB8ng3PbUtbfn71S9zC5xRTiqjEgZ/2/F7wjE7TcIi9K 1kjyl60+QZ3sxqAI81crOQwE44hz4PbaAuGHZGEpFElFJY6f0bDNPohnn5QS1KdsSw6E qfiAx/d1gKHU6GAkkRYvt6JBMgnLEQg0Js0+8rLzfU98oCo384T003dm+faelQWQui7I Q59x3auRbMoTP/phfqmODLkckijJAy1qtOrBCSuZTGjzfYRRZJ8U/lNIi1QIfQCNaiRl COflclnIAML3NuEOjYtJ8S7E3fMwsEr2f9wyzqsRJOJi/+ZDtJSYZxMB8a45HlwoyoIJ ikYQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id k6si6855494pln.23.2017.07.14.05.11.55; Fri, 14 Jul 2017 05:11:55 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932130AbdGNMLm (ORCPT + 25 others); Fri, 14 Jul 2017 08:11:42 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:61645 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753787AbdGNMLj (ORCPT ); Fri, 14 Jul 2017 08:11:39 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0Mf1KL-1dGvXl2BDN-00OWv0; Fri, 14 Jul 2017 14:10:32 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Shrikrishna Khare , "VMware, Inc." Cc: Greg Kroah-Hartman , Linus Torvalds , Guenter Roeck , akpm@linux-foundation.org, netdev@vger.kernel.org, "David S . Miller" , "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi@vger.kernel.org, x86@kernel.org, Arnd Bergmann Subject: [PATCH 12/22] vmxnet3: avoid format strint overflow warning Date: Fri, 14 Jul 2017 14:07:04 +0200 Message-Id: <20170714120720.906842-13-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170714120720.906842-1-arnd@arndb.de> References: <20170714120720.906842-1-arnd@arndb.de> X-Provags-ID: V03:K0:P2RaBenBKc4eTUfOsEZ4xqyJbEaYR3P5Vx8j3pSAdMLqJpaRwfC 7YuUUvIqkOXnmzHPFAcDhK3GwxTVwZetsLoWRW8Ko+twyNs+Yy/SPGWP3BFmqSxLLb2wzIz Y32QvDuCauxji8VfES/xpvLbkktfzxZpEhRBO8FXwG7ohUVAt8Me86BlAOjLEfBlag5NToq 2Snyjvpdh4eygbl3UFtZw== X-UI-Out-Filterresults: notjunk:1; V01:K0:clGIvw0dkoA=:JGIzyFf24d82hzneC2fnEQ F8tHoPJjdgrUJaHOKRlG4P1f0SduwBWmoAU6Kb6FbyF29pTfmL9RZxTisyamHupo70hW3ZI9F Wf6wY6uLmTUEMY+IRAmgh3Y06iRX7x1OYIsHRf0v5c/y9Ly1PSQC7rI9171dD1PKP0P3meCGK nIPRPEpMRqnFZ+zFZJrjWzINPr/CO7T76RLxL5GSIUrgQmSbTvX0MulXyMr9IQqWAdEDpGGo2 NJyK0fb3fGBSxxZunPedY8vnUWSLSi93lZEuQ9i3DGKtnGEq97YGLTffCj6DOtzvLWhiNDD9a yBcqB26yLjSA6VUEbMjQSKOhW1U/m5Y2lkdT/xK3utu1181azvQECr0y0JnFcRv0aOuBYR7Aa ZyUO9jDHiRfREEY3mwX8RptWgkmLmKTZCokaCbDP3VmLXCuHQvQQ9ju6pA6ys2qj5lt0c7CS8 dBdLd2cWiZeQ6u80LVylOfBMtmxWLuldfVEmnW0CCzSyhDASEg0UXVHWuf1z6nJNZhRZTdVU4 NaqG6D8WjivE/dmaQuBEOJW/FLzENA+Egkb7eTv7tmbPKpBrWaK1RMWUKViXW/+jZvvBPY0Hr u2uX/56V4WSdowf5Fn/g6WST8zf9atLGTrel36XfGD9RX+r5Lcw7VXn5TiQPH5UlHJF5xUEQ4 b5kZQ35cMNwWGg2BU2YGOi3mBFqRmt1Nm8YYU1ej7qQcN1GIIjxqMwE7iskW5B9UFFaVKvXm5 vZtacPa1CG/C6FkR2GwTc8TD3kJzB67WkoD3bA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc-7 notices that "-event-%d" could be more than 11 characters long if we had larger 'vector' numbers: drivers/net/vmxnet3/vmxnet3_drv.c: In function 'vmxnet3_activate_dev': drivers/net/vmxnet3/vmxnet3_drv.c:2095:40: error: 'sprintf' may write a terminating nul past the end of the destination [-Werror=format-overflow=] sprintf(intr->event_msi_vector_name, "%s-event-%d", ^~~~~~~~~~~~~ drivers/net/vmxnet3/vmxnet3_drv.c:2095:3: note: 'sprintf' output between 9 and 33 bytes into a destination of size 32 The current code is safe, but making the string a little longer is harmless and lets gcc see that it's ok. Signed-off-by: Arnd Bergmann --- drivers/net/vmxnet3/vmxnet3_int.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/net/vmxnet3/vmxnet3_int.h b/drivers/net/vmxnet3/vmxnet3_int.h index ba1c9f93592b..9c51b8be0038 100644 --- a/drivers/net/vmxnet3/vmxnet3_int.h +++ b/drivers/net/vmxnet3/vmxnet3_int.h @@ -311,7 +311,7 @@ struct vmxnet3_intr { u8 num_intrs; /* # of intr vectors */ u8 event_intr_idx; /* idx of the intr vector for event */ u8 mod_levels[VMXNET3_LINUX_MAX_MSIX_VECT]; /* moderation level */ - char event_msi_vector_name[IFNAMSIZ+11]; + char event_msi_vector_name[IFNAMSIZ+17]; #ifdef CONFIG_PCI_MSI struct msix_entry msix_entries[VMXNET3_LINUX_MAX_MSIX_VECT]; #endif From patchwork Fri Jul 14 12:07:05 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 107791 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp891413obm; Fri, 14 Jul 2017 05:12:28 -0700 (PDT) X-Received: by 10.84.231.140 with SMTP id g12mr15874385plk.256.1500034348000; Fri, 14 Jul 2017 05:12:28 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500034347; cv=none; d=google.com; s=arc-20160816; b=rSVLlUSJr+32v3oqLucDwZHcl/+1HkAGkYXtKDywHvchLCZgbanD0gQ4XrGUdAwyQF lXiPUIAr7kpO6G8VVetzh3zn+mfCd9h0SIR9YA2UEYbG9Ko4k+1vhxyhj6V+ApEUA6+P w1+mpvdUThMSDi3Lsn/z7mtJV9hGB/3fy/1AA4LpJQ8bzrGQq/9N3ICZW/I/MN8aoh64 9LKLQbWPapMJqhZcFfPmlTX6iQwuhMkGxx9GZCyXaK4gzCcyVK3GdExVwYR6WHXRhaS/ PB4YB6oUcVro2l6UJtXx63D5zVPHo6mkD1K7abeIwDteEuxmNamUgdZYWaJ4b7gweL8t 95dA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=jAn/Y1wFk+QoAP8Y3UiLmfTqSNU7yEYraCHwS+2jfOM=; b=Zo5+DR3HInfo36dj4Ale4tgFqzYxDEw9o5OViLOPKcuM/W9P9n1n+2C+t3sgpcvGny ZeXrjja2LSdsF8YLlULcr6gCY7RT78WaV1hbFqv6old2fC96liHZfDLfZRf2pZ7W/3pJ I0hHMdVQJ+cue7WtRxQLgI9Q1+o0ytVC+eSQvsHaMyz6VUzhdRztf87d18TwF1Ur56TR 1J2XgUWbglxA4JRcQN3tLeNt9hlG/MIGLdwzkaEz1jlHDW+D9j2yMExfmOoLF6VkZ9W+ IyTD5u3DLgKnu55i07PAS/cxp2wr4y+ooKL8J9nS0wOZpH88eaMTFxKlOP8T1O3HYBns BaYQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id 65si6730523plb.307.2017.07.14.05.12.27; Fri, 14 Jul 2017 05:12:27 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754245AbdGNMMU (ORCPT + 25 others); Fri, 14 Jul 2017 08:12:20 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:50352 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753704AbdGNMMP (ORCPT ); Fri, 14 Jul 2017 08:12:15 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0MC1A0-1dN9k31JSK-008sgp; Fri, 14 Jul 2017 14:10:43 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Derek Chickles , Satanand Burla , Felix Manlunas , Raghu Vatsavayi Cc: Greg Kroah-Hartman , Linus Torvalds , Guenter Roeck , akpm@linux-foundation.org, netdev@vger.kernel.org, "David S . Miller" , "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi@vger.kernel.org, x86@kernel.org, Arnd Bergmann , Weilin Chang , Prasad Kanneganti Subject: [PATCH 13/22] liquidio: fix possible eeprom format string overflow Date: Fri, 14 Jul 2017 14:07:05 +0200 Message-Id: <20170714120720.906842-14-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170714120720.906842-1-arnd@arndb.de> References: <20170714120720.906842-1-arnd@arndb.de> X-Provags-ID: V03:K0:EX/h095j41LioVeHzcrbQ43WG5O+ZZgW2fLW/9CKuUMFrEenNmK 10yLac02skkRgJa9LITZ+FR6pj2N4RZRoIvHruGMmonzCVBUNaoOcwVUfaEMa96TzVdHJWt AOBND69iH3iJ9EcSTzp1X3q1A9BWH6SMHAiobQc7jNEklXPYl2Ogx89btviV7FMXZFznxI4 ez3xk/HHpsp2Ug6K5LxNw== X-UI-Out-Filterresults: notjunk:1; V01:K0:5b/hsNv8B50=:yUq/y6nWrX9KyU4v05iiHB E58fCLOl8SNOh3xhKfa1I+N+gqk9yrGB8C/BlJbH2CV7nbUsdCke4cTWVTbTmzSEo5b352dx1 5H1aotSu2lqnjNoTfqN38JsABi9x1taXMMJ0ROX66utK2158JHSK87z6RTNn4sTgn1oZWWFx8 BeYbMEqJIP8PjkPIlJK1bdl1//VAs9FRxZFNrbLc85olCK9udLJOYW15cFj+rY33HYIOge5Uq xeNyfar23YfZMBkhbHQl0Q3BOztedKg/ienxpbP0VIq3Or7O6Qo8ijHL92IHVaJP1rjULpDyg 3+it/uBAYJ7/azBrg1shbmYeMin8g5pBrkVTtqi+HN4mlMkFrYlUPdMuR9ZT75T5mLEP5boNC MnbhJS5tOQ6Bj4DPiZRDQtt+ZXP/xhJdXlIO565cdUjvlT38lYF9a33SyBYBTTiS8Bgibot+b cYUn22tGP54ajEPoCbOdXfM60MeKpVZIkbTM8tOg+mc9wPAeV6C66xP/qMryT8+J/GgH9U9kk EN9IVR7O2C69wBibF54672PDlPstWMO70fECWiVtI93wp4hO5apVtByz9T08cWRw/5O1ekSVw gy7A++0vVYe5fhEZh9LW+5zzSUZfbIblzOQX/DZEogqUmBkvWS7uTHD/1iIXBnRUSVnhWUVjZ X77ryFC0w8Q6NdLlECQBkmDTg5wpHZ8QwoMfH7uYiuKzXF2ab8M2d/RfGi9goJchIyahpZUwD 9u6CQ7LhbYm6FwQdAO29CkjJG8QRAH4sqjNMIw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc reports that the temporary buffer for computing the string length may be too small here: drivers/net/ethernet/cavium/liquidio/lio_ethtool.c: In function 'lio_get_eeprom_len': /drivers/net/ethernet/cavium/liquidio/lio_ethtool.c:345:21: error: 'sprintf' may write a terminating nul past the end of the destination [-Werror=format-overflow=] len = sprintf(buf, "boardname:%s serialnum:%s maj:%lld min:%lld\n", ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ drivers/net/ethernet/cavium/liquidio/lio_ethtool.c:345:6: note: 'sprintf' output between 35 and 167 bytes into a destination of size 128 len = sprintf(buf, "boardname:%s serialnum:%s maj:%lld min:%lld\n", This extends it to 192 bytes, which is certainly enough. As far as I could tell, there are no other constraints that require a specific maximum size. Signed-off-by: Arnd Bergmann --- drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c index 28ecda3d3404..ebd353bc78ff 100644 --- a/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c +++ b/drivers/net/ethernet/cavium/liquidio/lio_ethtool.c @@ -335,7 +335,7 @@ lio_ethtool_get_channels(struct net_device *dev, static int lio_get_eeprom_len(struct net_device *netdev) { - u8 buf[128]; + u8 buf[192]; struct lio *lio = GET_LIO(netdev); struct octeon_device *oct_dev = lio->oct_dev; struct octeon_board_info *board_info; From patchwork Fri Jul 14 12:07:06 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 107793 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp892335obm; Fri, 14 Jul 2017 05:13:12 -0700 (PDT) X-Received: by 10.84.216.13 with SMTP id m13mr15575553pli.201.1500034392649; Fri, 14 Jul 2017 05:13:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500034392; cv=none; d=google.com; s=arc-20160816; b=xNsOlajLA5+GVp13Dlt15RGtmrai4I/PCX8trlX6puaPSLwAqrRjzxV08RZldv75HL 2zyPlIDnbqTXI1KHYK3Vzgip5JjP5GFkQ6R9oF20KxOhfT4MNLcRvvEHCP03AZjTAW+h k4PrfCAD2kPZqQoGjiy3JLkI9q0ryh4g2aFvkKhE6gOaMWgSJSCKGdTgu1cNYHF5OchB nJTbkuW2EG1jBU7+jVrDklPnPHrRdaEy2B2dBlAm4C9soTyTbSb9KYKh3brbSNNkVjdW yOVmsQHYtUcWxpvLExzCvEu8DEtaykqYugOWFluED0e3dwnaL7oY7SVt2WuzCY01XOzu MsBg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=wkTV8lUrV/j/eIBpbCJFMTm/QWgJEMpbn0xXcny/S6I=; b=xDRDLJlTFtRtBdq649HLunpX/kVQPRx0k3qxrGmUlrloA2yby1/nTtbT2Y+g64pG9B U421vjOcvjYGzN4+Dc0qWPRiAeBeePXN1vtueIf/3iDmYPXIjaDNR51b+Z3L+ggCanUi Tb+PMJIWNNFyi2wlKDOU4Dnh/eyYCB1oK9cTHxgfN8VkQR+M1ABSUt97v0tHVl6jT50M wgFLlnzP7mbkZrDTcmUnvDolutyG9o4sOQCx0J5JeJTEowLLriQGO+nPGtRbQIsPahpZ gF4umVpn8u5o/13mrc+JdnnuNktrgocGNlz3o08YL+19wOMo/yS+iWCMyI0UAFIEe8mM 3p0g== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y22si6917635pli.164.2017.07.14.05.13.12; Fri, 14 Jul 2017 05:13:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932169AbdGNMNI (ORCPT + 25 others); Fri, 14 Jul 2017 08:13:08 -0400 Received: from mout.kundenserver.de ([212.227.17.10]:60900 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754256AbdGNMMc (ORCPT ); Fri, 14 Jul 2017 08:12:32 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0MSrBt-1d6zuO0zYr-00RmaI; Fri, 14 Jul 2017 14:11:05 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Hans Verkuil , Mauro Carvalho Chehab Cc: Greg Kroah-Hartman , Linus Torvalds , Guenter Roeck , akpm@linux-foundation.org, netdev@vger.kernel.org, "David S . Miller" , "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi@vger.kernel.org, x86@kernel.org, Arnd Bergmann , Sakari Ailus , linux-media@vger.kernel.org Subject: [PATCH 14/22] [media] usbvision-i2c: fix format overflow warning Date: Fri, 14 Jul 2017 14:07:06 +0200 Message-Id: <20170714120720.906842-15-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170714120720.906842-1-arnd@arndb.de> References: <20170714120720.906842-1-arnd@arndb.de> X-Provags-ID: V03:K0:2XJD1jUlPzw9FKBfso5qF39QSPl71WsFcuA6LbOeeBJSW10bY0P DCHuNRZ/h/1TQR5+eS0fxzl7st9a+s6cO3MmEi2aBP6U/MzP+i0JLJLkFbSTKGUY5ZDpK8c 5EaJ6gFgKbGXEBi2p2/yARMQtwL78GeAe4vRJoUt1JJFz2sq3jae1NpkSF4HE436rWLizUn UVg6GIJaBX1tU8ZCFnNEQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:OnmJhxsmQiQ=:PkFulciumtMPaR9bQqxcA3 viKStjAgs89yynULMvF3N3eIeeanzDsEczFU8xClV98+b2rK5HULDXif9pvDmLvZSy9Qz/9xh D2B+98p2pnw+EMfz5Krg12WwQ6T0eG2QAsnf+wCTAH490FV3XOxVI8ASj1U5/7mMjWG1nVOnm lQVvEXelQSJ4q8ON9bMhQWLxM/AS1k5x5yMj2TSDFouxmN7wrJxPnzFNCPk2tYDZlUEt+ErMj fuk0gU9R6+Bt6bC7TGtjQjI+qhPm6cwGb8shNYOn+ZkQ3I6+hR5WwVB6NPT/bkDT800kcyyNX j+VPY6ojemWd8krsL1V4RIWfYYk6dY+dqfHWTZslBTAC+MWUkpZyaZQk0OIebI5PcbsKE4auF vIKbPj8j7f9dhvDhb1mcbzIT6O6T5R4ny9hrtkpOc7Rn+d/PI9W6CTnh9ntvx9mRYSnt4Ueb+ 1CpAdkHNUKPsfZwzu05TfZp6f4rrsaiAP4o7z2Lzafr4a+ewjdxflwOvjOqo1KcLfs/QUrf95 ZfoF+Y5HNtAALONwUvt9vb0EU0ARj0k4HzIdrwMf1wODePs1/4jX/IPCmiTwnkldfmH0mvakv gMKXxk0KZNR6sPQML571EPrETo7pMG7v+pXBiMjbX0nWXpEjLrFYEfw2Gyc5h5cYha0q3P565 hDCLKLxujMP5r4domarJEc4OOfb+F+f39Ag+TSpSBWX/4PYx3q0QnMoUYgMCTX+hK46IabPMD zEd8LG9JzkywIfT6+DvuMBO9qmM/oVMQB3zgow== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc-7 notices that we copy a fixed length string into another string of the same size, with additional characters: drivers/media/usb/usbvision/usbvision-i2c.c: In function 'usbvision_i2c_register': drivers/media/usb/usbvision/usbvision-i2c.c:190:36: error: '%d' directive writing between 1 and 11 bytes into a region of size between 0 and 47 [-Werror=format-overflow=] sprintf(usbvision->i2c_adap.name, "%s-%d-%s", i2c_adap_template.name, ^~~~~~~~~~ drivers/media/usb/usbvision/usbvision-i2c.c:190:2: note: 'sprintf' output between 4 and 76 bytes into a destination of size 48 We know this is fine as the template name is always "usbvision", so we can easily avoid the warning by using this as the format string directly. Signed-off-by: Arnd Bergmann --- drivers/media/usb/usbvision/usbvision-i2c.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/drivers/media/usb/usbvision/usbvision-i2c.c b/drivers/media/usb/usbvision/usbvision-i2c.c index fdf6b6e285da..aae9f69884da 100644 --- a/drivers/media/usb/usbvision/usbvision-i2c.c +++ b/drivers/media/usb/usbvision/usbvision-i2c.c @@ -187,8 +187,8 @@ int usbvision_i2c_register(struct usb_usbvision *usbvision) usbvision->i2c_adap = i2c_adap_template; - sprintf(usbvision->i2c_adap.name, "%s-%d-%s", i2c_adap_template.name, - usbvision->dev->bus->busnum, usbvision->dev->devpath); + sprintf(usbvision->i2c_adap.name, "usbvision-%d-%s", + usbvision->dev->bus->busnum, usbvision->dev->devpath); PDEBUG(DBG_I2C, "Adaptername: %s", usbvision->i2c_adap.name); usbvision->i2c_adap.dev.parent = &usbvision->dev->dev; From patchwork Fri Jul 14 12:07:07 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 107792 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp891662obm; Fri, 14 Jul 2017 05:12:39 -0700 (PDT) X-Received: by 10.98.200.208 with SMTP id i77mr4920211pfk.54.1500034359550; Fri, 14 Jul 2017 05:12:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500034359; cv=none; d=google.com; s=arc-20160816; b=gj28Gy40GyUFn2y/4m2Wu3DoLxeU3zNcQOMuQdgJ1aymhl/odiqH8fgeofFAvEBPoL h+lSUtu1jzr6tSsgEBun0cuqdMH0LZZ+bdkDRfGO1eIaUqGVq10UT6bJXb66TKrR05Vw baa8y6tjA/MrQMIVFMDkjo60hQCh029apqRa6M3zjN99J046lf5QBBcz5FpYm1fIqO1T FqFXANeZWVKQLd+HDGpVVwhpR50sYuN69uxoVcmdrPA9Oqoe4zstlkVi1TQcnlrErIIa NRf9mczbPp/1Lj+Inl3Z6Vi3Q82UKpCb3itEjCyRgVk954bIULNSJ494nIdJU/L5lAgp HV7A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=5K44f/lnO3maSXI8PEu89Or0t/0pl3Sc2x0X72MgaEc=; b=nCsM+m+2yPlttANPW5vpIrsVtX0Nt09DXPdumWNtlS9WGycRakEkDkWN0bIE1YJT8C 4ZQkvToN7fiyy28fe9twJlUQH7uYh6veqH7ZNI346tk3WCQI9Kg/ONBgyTZUF55Ub4lW otKPsSMneR6LW06pk8lDhj4Hb2qNC9WpnF9VlSwFuTrIhFBRe3HD1F/jtLSo9KpSMWeu UAloZGph7B8R3FiwDAjcOp9EggxIVJU3faEvwz3/kLzRePOgWMRrTMVfAw77fgeM57pe nrqJY0szSIcJMP5ghSFLcUpZ7+kKgFU6HEHf09ROXI+jWTdw/V38DQQyVZ9CrdnFqjXV E/5w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id m25si3479214pge.248.2017.07.14.05.12.39; Fri, 14 Jul 2017 05:12:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932134AbdGNMMe (ORCPT + 25 others); Fri, 14 Jul 2017 08:12:34 -0400 Received: from mout.kundenserver.de ([212.227.17.13]:52163 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753577AbdGNMMa (ORCPT ); Fri, 14 Jul 2017 08:12:30 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0M0zHj-1dnFfx3msJ-00v5z6; Fri, 14 Jul 2017 14:11:15 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Henrik Rydberg , Jean Delvare , Guenter Roeck Cc: Greg Kroah-Hartman , Linus Torvalds , akpm@linux-foundation.org, netdev@vger.kernel.org, "David S . Miller" , "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi@vger.kernel.org, x86@kernel.org, Arnd Bergmann , linux-hwmon@vger.kernel.org Subject: [PATCH 15/22] hwmon: applesmc: fix format string overflow Date: Fri, 14 Jul 2017 14:07:07 +0200 Message-Id: <20170714120720.906842-16-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170714120720.906842-1-arnd@arndb.de> References: <20170714120720.906842-1-arnd@arndb.de> X-Provags-ID: V03:K0:EVXxi8Zcg44DGLm90NBmJx+6uvH9r38SU5y2VcZGqs49u2RA/tf eIlhqCGffZNYfX1/j1qJuqmX62baOD/34u30oyYebqM06MNayQ1JOxdHXXxg0EyYJLNnbo3 pmxhBkLX+GMX3faGLNuLobXDEvg8x6jsIxad0kJZs1McPdk267KGJbT2ediXlZM7YFf7HS4 vLizQGCpdMNns/0sFawxg== X-UI-Out-Filterresults: notjunk:1; V01:K0:sP0UG4dlMQE=:akFpSTCBf8Zvk1xK3jYi+l /o3D8jhjGvcq/4C4qbUo4tJOn9nKfbYm+mWY+Xq1i8KFvT9/jjk12I+4vT0yzvl5BjSmjmMtn wu+0WL6Ipid15zCitDnlu97YD4C31KhBaiFIzuSlJKChIpS6oOFTEy2p7zCT8mIOKjGZXM5JT gPFQKscGpCoVSAiB4qpexuIvoLNvD3VblzxrrBT9I2ThL+1SrCho6vCxMTadwAWlReDvwTYtA G1Iiz1vCr0Q8j0QRM26Nh4yJM0fDsPNYJtKgV2LFSEczS6SO7/l0KAIyzMDUxLpNy6H9Gv4Km PNbe95gWtd6vpVNy+Pr7UGepT/367QPSLEmPP5E1jzDB7f6w5dlUBGyvqhHnBwszO2y61/i8r P5MfzU7q2fgM+tRBS1wVIOA/UEZu0BnNZQXZP+EkEKxOFkd9pRe+dzHTMbB79SZRhTJ7sWkCl pvnsYfu2WJihG4dnhjEwyRsWBg/edm+BmekLvptlZKwDw5ENzjmz7VnRwNpwowUUsmRGXEBjv c012BP9ujV3+lpptOEZWo11MCqnpimsrE/EsnDigxlkPL406db9TYePqxK4pNpn36Qok3fGC6 HQo4ElkZsMaEykbuMJTQ1qgqDwkOdIIwAJqJCiT2pUSb6MOAAmdR62tQ5sqXnoYkMu5n8y2oI y09CZoBuiKKHbYM2jTfSSn4HYzh1WMa0IeALK6QWl+rNJumDN6VK8lUNLOURF1qVKFz8zL7KQ +Y0IbQxerhLPETmRCG3EmeKac0tXFAhV2hfjdw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc-7 warns that the key might exceed five bytes for lage index values: drivers/hwmon/applesmc.c: In function 'applesmc_show_fan_position': drivers/hwmon/applesmc.c:906:18: error: '%d' directive writing between 1 and 5 bytes into a region of size 4 [-Werror=format-overflow=] sprintf(newkey, FAN_ID_FMT, to_index(attr)); ^~~~~~~ drivers/hwmon/applesmc.c:906:18: note: directive argument in the range [0, 65535] drivers/hwmon/applesmc.c:906:2: note: 'sprintf' output between 5 and 9 bytes into a destination of size 5 As the key is required to be four characters plus trailing zero, we know that the index has to be small here. I'm using snprintf() to avoid the warning. This would truncate the string instead of overflowing. Signed-off-by: Arnd Bergmann --- drivers/hwmon/applesmc.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 diff --git a/drivers/hwmon/applesmc.c b/drivers/hwmon/applesmc.c index 0af7fd311979..515163b9a89f 100644 --- a/drivers/hwmon/applesmc.c +++ b/drivers/hwmon/applesmc.c @@ -903,7 +903,7 @@ static ssize_t applesmc_show_fan_position(struct device *dev, char newkey[5]; u8 buffer[17]; - sprintf(newkey, FAN_ID_FMT, to_index(attr)); + snprintf(newkey, sizeof(newkey), FAN_ID_FMT, to_index(attr)); ret = applesmc_read_key(newkey, buffer, 16); buffer[16] = 0; From patchwork Fri Jul 14 12:07:08 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 107797 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp893478obm; Fri, 14 Jul 2017 05:14:09 -0700 (PDT) X-Received: by 10.99.114.19 with SMTP id n19mr14440521pgc.81.1500034449098; Fri, 14 Jul 2017 05:14:09 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500034449; cv=none; d=google.com; s=arc-20160816; b=HLyOJJauqtg7pEN2Wc8R062QcKszWxiceSr5W0KgNQuXa/PTAVnyKjlWgPpHsC26gj k0GImE23XA66V+7L6Ii4v8BJggdvFjRlSo4KmV7LX3+//hE9mSisQ/M28fRjBQYQLe3g 9r9ew2eryeS3Br3XuN8cuAg/WUmwa6uMO+zSRT+blE8NutNiqS8ozYF0HOfelJoBZDQe oxIsXMZIHRHSPlEleyEjonYfr3WEDjEALZHLjdV00K7CiABZbcDezG8fsdeUC7taQX9g mM8gorA0C+r9oO+QLYRlNmq1qEQG+2f44OU6RpPQoHyJZOI9LyJuTpO3uJOJgCb0t02T v1GA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=Vnm61LVxHySMmKbNv1bTYeSnEEb1piSzSUjcyI+NBgQ=; b=uiS0UKUO/vNzG2MchTEJN9S3s9sSc0x70nUnHbxIjo+BX8GltVg3ltgEVsAOPzECUR TG02uxco/fiuPz7+9STIoE5P0Wrv/g39pMBSMgH6/PT81/QczoczdmzU35PSdmgOFfty XSXQB1cISAz32zyvOMkNWxR0zio1uqR5UxWp85QEFts56SbMVwllLYn36KwZBg0swfBG dE3gwh6f+s632ra23JyNp2Y6IlHh2Q9dn1n2CMwd6pMgFzw5WqJ0/+XphVSenPLIRTF6 MVufRdNzepekUubisun+SGVSYPt1IWGe+4+HoW2prwMLgBMjrKtv8lQQ66EIwusuJvKA EOyQ== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id e8si6351241plk.206.2017.07.14.05.14.08; Fri, 14 Jul 2017 05:14:09 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932256AbdGNMOE (ORCPT + 25 others); Fri, 14 Jul 2017 08:14:04 -0400 Received: from mout.kundenserver.de ([217.72.192.74]:65230 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754032AbdGNMOB (ORCPT ); Fri, 14 Jul 2017 08:14:01 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0LqkxG-1e9z5X106c-00eQ4b; Fri, 14 Jul 2017 14:11:29 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Thomas Gleixner , Ingo Molnar , "H. Peter Anvin" , x86@kernel.org Cc: Greg Kroah-Hartman , Linus Torvalds , Guenter Roeck , akpm@linux-foundation.org, netdev@vger.kernel.org, "David S . Miller" , "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi@vger.kernel.org, Arnd Bergmann Subject: [PATCH 16/22] x86: intel-mid: fix a format string overflow warning Date: Fri, 14 Jul 2017 14:07:08 +0200 Message-Id: <20170714120720.906842-17-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170714120720.906842-1-arnd@arndb.de> References: <20170714120720.906842-1-arnd@arndb.de> X-Provags-ID: V03:K0:Ow1QTKqvzL+U8vQvwpq/O+ZVhkYePadVLmv35X6ldPEIJGkWJw+ e4NWBESfjhU7/YL7G+id8DL+fueIX2Ao/RXfmj/M6z1rsnf9kHeXtOjU6Meyz+j+/BKgztP jErPfxz4yrkLIGw660UHk0LepVXfFllG1f/0xxmH2C5wF+zhJufecUfPg6Tkx9zOhke0q1+ 6bxAAJZCucCr1xx3krsZA== X-UI-Out-Filterresults: notjunk:1; V01:K0:cYGNl6m4YRk=:ANrBhW77eJEB8S9PH0KBHQ xvspo2ewqCFp9auENxkzvGfIZbNclDFi++PLNYcDHfutTHvILDHsGBtzzo/mE7xsqMyUe1Gdx Dl2cukNudcNwf0UT+YERUxYuVr52okgAYJBKjS37/qNsheD6EnSaeuqQ2hDo9WoBHvEZ6fTkI F68JbkhcO6pJaRY/9vA5GvGIz7SndMwYBKv4Fr26tu+vlXxQ9heAR4ZnKjPX002c0NI0zOdym xu9mfb9XMcPiPDn4b/aNykKJVAADclVls7XFNYXU/eDB4TjJIDS0fqXiFwTLboRCsKK1ZGXMc Ju6wt+Hrg3W9H4gj4qy2u1ss8CAohI6Vg3r2V7imbKuSGSmcWp0RnW3nn+SeKJf+wNKNVRTWr zbF2jM6/d55huS+/qG63E09RAfHtW+IRFQEaCP6j3+uFrENelBHv7ceAJApHs4D/5+C7s5p7Z +s7cLItcdje9dK7glkzUiTGwUbbRbj+grXlCds3nyLxqnX1B6CcqEGS8jwIYU5vEsLpKoCOJd g1eckZDfN86lFoRxpQLqLhLm6PGoHKw778KS0rg5djR86enL58j7dJI06OYU3MGUneSFbnR9Y BfNIle9uXtMJSfmUoIFPj9lpjghoZMwvng93Pp+ofKGm86EJb3zxBgCOAqhh21ueWu+EUuqft 9awSSIwvwYVun5kYr6ffNNiA0kmTbF/zBjFUXYvH4ywkanBuNnHLERjRJGtwguyLfVOmZ+eZ3 NAPVxJ2u+p6Ypov8B6HMZUKNZDtHFeRPMuN8lg== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org We have space for exactly one character for the index in "max7315_%d_base", but as gcc points out having more would cause an string overflow: arch/x86/platform/intel-mid/device_libs/platform_max7315.c: In function 'max7315_platform_data': arch/x86/platform/intel-mid/device_libs/platform_max7315.c:41:26: error: '%d' directive writing between 1 and 11 bytes into a region of size 9 [-Werror=format-overflow=] sprintf(base_pin_name, "max7315_%d_base", nr); ^~~~~~~~~~~~~~~~~ arch/x86/platform/intel-mid/device_libs/platform_max7315.c:41:26: note: directive argument in the range [-2147483647, 2147483647] arm-soc/arch/x86/platform/intel-mid/device_libs/platform_max7315.c:41:3: note: 'sprintf' output between 15 and 25 bytes into a destination of size 17 sprintf(base_pin_name, "max7315_%d_base", nr); This makes it use an snprintf() to truncate the string if that happened rather than overflowing the stack. Signed-off-by: Arnd Bergmann --- arch/x86/platform/intel-mid/device_libs/platform_max7315.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) -- 2.9.0 diff --git a/arch/x86/platform/intel-mid/device_libs/platform_max7315.c b/arch/x86/platform/intel-mid/device_libs/platform_max7315.c index 6e075afa7877..58337b2bc682 100644 --- a/arch/x86/platform/intel-mid/device_libs/platform_max7315.c +++ b/arch/x86/platform/intel-mid/device_libs/platform_max7315.c @@ -38,8 +38,10 @@ static void __init *max7315_platform_data(void *info) */ strcpy(i2c_info->type, "max7315"); if (nr++) { - sprintf(base_pin_name, "max7315_%d_base", nr); - sprintf(intr_pin_name, "max7315_%d_int", nr); + snprintf(base_pin_name, sizeof(base_pin_name), + "max7315_%d_base", nr); + snprintf(intr_pin_name, sizeof(intr_pin_name), + "max7315_%d_int", nr); } else { strcpy(base_pin_name, "max7315_base"); strcpy(intr_pin_name, "max7315_int"); From patchwork Fri Jul 14 12:07:09 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 107795 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp892735obm; Fri, 14 Jul 2017 05:13:30 -0700 (PDT) X-Received: by 10.84.213.9 with SMTP id f9mr15508215pli.22.1500034410565; Fri, 14 Jul 2017 05:13:30 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500034410; cv=none; d=google.com; s=arc-20160816; b=K2vLTUzz7gPWiFjW4h4CXLeQrvQS7dToPFjbraDwoOuKehsZoBt8GK70lDtHVZ84yb FLfSQPRv3LHZ+5lDeNo95LmIuZu1lmqllzx//v3VMXbDj3yvLTtTMXNNLBmS5bkkp6Ki 7YW8xOEH9+MERLNkmPH5SBf6spFOE5m9knmV07901CUwspL7bRYIh0FzJUTk/FzjPBe2 qaS/2HBJij7F1rG9w+fGSMG2O3Ueb3CdnaMHJOGETa+EEZ/rEnbIjFVqiRSxbiW9klzz tYE2y+IiikGhqRDJvjvNKB3vKoyuySLf70tbVJVN7/5YvhD4agPD9OMaUPaZe7Gtg24L 6A+Q== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=ZEps2EWb2Wd9JdCii+wlORN8NbXuBCJOdYuTnZmNqsw=; b=k6JxZtqQAlOM9kg4GrP+GzhiMC31zO6hqjKmxz+wP42g/o4LCSTlACKTSR1dIOgwto 6y2Xwdwp3A6nqJbZ7+Gy0l/fJosZSy4WZsgXgTx1K7L3TapQ+eHEKxwu4TPWqRjv6rAo tRY5JZC6/HJ+diYYOC8d/dVb9e5DdAvBIDl0xsjXWYgmnnE1/rQRn18ukTOLVdY1Z9xJ peMbCDtKJtSoRt0xrNVOlSQxVs65+GOgQxNFnoh1ksAJ2ev2WsC9B/nU/GUPB8laLezZ 31BZwkLM9o2mnqVubmdivPwN9RKG2PJUFD14+L6BYInb7EdZe3gDPvSnazohnpBUuWX/ W4DA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id y4si6245147pgc.233.2017.07.14.05.13.30; Fri, 14 Jul 2017 05:13:30 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932231AbdGNMN0 (ORCPT + 25 others); Fri, 14 Jul 2017 08:13:26 -0400 Received: from mout.kundenserver.de ([217.72.192.73]:59521 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932120AbdGNMNW (ORCPT ); Fri, 14 Jul 2017 08:13:22 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0MC1A0-1dN9jt3sxM-008sgp; Fri, 14 Jul 2017 14:11:38 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Darren Hart , Andy Shevchenko Cc: Greg Kroah-Hartman , Linus Torvalds , Guenter Roeck , akpm@linux-foundation.org, netdev@vger.kernel.org, "David S . Miller" , "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi@vger.kernel.org, x86@kernel.org, Arnd Bergmann , Mario Limonciello , Arvind Yadav , platform-driver-x86@vger.kernel.org Subject: [PATCH 17/22] platform/x86: alienware-wmi: fix format string overflow warning Date: Fri, 14 Jul 2017 14:07:09 +0200 Message-Id: <20170714120720.906842-18-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170714120720.906842-1-arnd@arndb.de> References: <20170714120720.906842-1-arnd@arndb.de> X-Provags-ID: V03:K0:4XOtuPAALKuS8DxTM63tcbwL/8NN7O+VNaaO6IXY6yExvaKs9+q fWY2mugP7xyQbW0zj+EObM2c92gx7ooN3s1U1zISxWscIUNvoQRnKyY8cPwpnpFJCVyKnNi xgBlP4ItAiHHzLnKaokDKlfS2WynwCcDb1aZzYO3moOl9zYpAxcMfiJ4tVk1pDKt9GHMmTA KjB4noAhvFZAyliZHyZwg== X-UI-Out-Filterresults: notjunk:1; V01:K0:BJ57ShxF6VI=:L5QQmo8R5VBld6R39q0TU4 kp/LlEYlQ+riAvJ0clOxpBbc1VmU5QgJExe2lEyHC26qyd82l+a6ojUu7XXD8svC/VQUr3Van K2rBCXI09zlpDCPEgFFiOHfImcuiQlHPD/BL4VW0aH+Zz2VPR20GtqzLORIjqZHBtxDV4zUzW 6OCz1+Pw+16RVoXSR48OTE4nu0PF3oZfnG8o0ckxiStJkXyBmNpO+7TLmAKxsarLWQs+fczKK 4JWI0Ex4csElmdBQP2E79Lwtp8F9hU0+nz/ZdE3MnAkqlBIg/BoYK58ArsDf2NsISBvxFM80/ L0c754AluW2rabgrNlPU9BBeIwaBCn+HhSw/EaFDf0xSjb16f0k2LO3UxQLFnYDBni6MGRrU+ lbXBKdvRZKUdKOnpwIJTzj856RPrwrnn2nsdGV7kdJNLXFN1Me5/bZ9+sVYb3rZBYOVhWTSra ty+A6fMi5xVwRVKrHOYHQbhrYmhJftb6pliBs1m9uvVMWYN8h53/NwAra8tCn3htySfi/GXeD vwbaec6p/voorH9LiN7VDwTaXmMZMXRjrnEQDAwzpVImkZqyFNfHmWSaHQYWfnu9WzSMr8QnM /pj2hvPyCoyzvpExfYw1qFOij8imdbQDx/dmGyWRWfiDd9dgn8LsTC4OBw7PyAPE3qczWNNdN wREjMiAOJqzjDqDEIxW6sWzJmt9mqhkv2U5KVqFrDrA7GTP7kfNWtKoAr+5xB3LuGBfGW9TU+ LKK4LZazIWdbJFpCcSqVUWlpCLhE+QUkpaXSOA== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc points out a possible format string overflow for a large value of 'zone': drivers/platform/x86/alienware-wmi.c: In function 'alienware_wmi_init': drivers/platform/x86/alienware-wmi.c:461:24: error: '%02X' directive writing between 2 and 8 bytes into a region of size 6 [-Werror=format-overflow=] sprintf(buffer, "zone%02X", i); ^~~~ drivers/platform/x86/alienware-wmi.c:461:19: note: directive argument in the range [0, 2147483646] sprintf(buffer, "zone%02X", i); ^~~~~~~~~~ drivers/platform/x86/alienware-wmi.c:461:3: note: 'sprintf' output between 7 and 13 bytes into a destination of size 10 While the zone should never be that large, it's easy to make the buffer a few bytes longer so gcc can prove this to be safe. Signed-off-by: Arnd Bergmann --- drivers/platform/x86/alienware-wmi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- 2.9.0 Signed-off-by: Mario Limonciello diff --git a/drivers/platform/x86/alienware-wmi.c b/drivers/platform/x86/alienware-wmi.c index 0831b428c217..acc01242da82 100644 --- a/drivers/platform/x86/alienware-wmi.c +++ b/drivers/platform/x86/alienware-wmi.c @@ -421,7 +421,7 @@ static DEVICE_ATTR(lighting_control_state, 0644, show_control_state, static int alienware_zone_init(struct platform_device *dev) { int i; - char buffer[10]; + char buffer[13]; char *name; if (interface == WMAX) { From patchwork Fri Jul 14 12:07:12 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 107799 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp894797obm; Fri, 14 Jul 2017 05:15:13 -0700 (PDT) X-Received: by 10.84.231.207 with SMTP id g15mr16069228pln.146.1500034512978; Fri, 14 Jul 2017 05:15:12 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500034512; cv=none; d=google.com; s=arc-20160816; b=ZAEfbBdlDq99db4cwNmInOvh5yG087cpXlo0446vVOJKEAc+dGvcjg85EIxDkdw+mE SCERT68zuYMlVoSc2lfVsdtWKyf7D8uFuS1GvBUM9TDryNn8DWivZWSq3lG0hlHhjccq QoODYmD1auV3kVFDR8A2wiMf1FD3UwqRF4rXrqLQrhBV5GI9/4qtmkWKmP3cUoKJWIY4 QoDUKZLJQPk4Z/JDRDVqebsI4uBRB0HBCKstXh3H/aNsojCAlRqoQye5I/b3A/29g2L2 2aAZ2cIaN1AFCsDmS+T/2TdjfSsWUly3Y7gjE8VSCsyLTKfRJf6YhLEjrUxJbTSIC9BP WDSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=awXEF2Uu1wMi80lL+C3ViWbyuJAZNZUUVCr/AAJFgzA=; b=EnMrB3GH5nUuysLU56I26ptt382DttaX3XS2A1dpsxdrxGwwiWP32yJ85FpQSsghZT wkUtaSbsSxVoV1Yn50+wBAlfdIhyJu2HAmmYoAGkV60b624+IvusbObxoAtSKC9radUb dUbjNs3XyTRxC5ZGxJTZlVhl17KzrP5arK47ju/GQTSFCvWLUaOBhTZI7dzJuUOQMq5H FQz39s8R0CrBtNIpSaZOkbM4AfCaUepClT5ZZLNXWohAQj6IeixFAXF6WyHxaE+vTTSK 3oI99mZpqBCugpTM1Z4y7PmTP9yA+Jl34pAm1IrwcnswxesInd8Zyzp8vDSvGyxLn2jl DIrw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i14si6123201pgn.378.2017.07.14.05.15.12; Fri, 14 Jul 2017 05:15:12 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932288AbdGNMPF (ORCPT + 25 others); Fri, 14 Jul 2017 08:15:05 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:63997 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932096AbdGNMPB (ORCPT ); Fri, 14 Jul 2017 08:15:01 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0LmL6w-1e5bT81NHG-00a0EH; Fri, 14 Jul 2017 14:13:12 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, Jaroslav Kysela , Takashi Iwai Cc: Greg Kroah-Hartman , Linus Torvalds , Guenter Roeck , akpm@linux-foundation.org, netdev@vger.kernel.org, "David S . Miller" , "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi@vger.kernel.org, x86@kernel.org, Arnd Bergmann , Geliang Tang , Takashi Sakamoto , alsa-devel@alsa-project.org Subject: [PATCH 20/22] sound: pci: avoid string overflow warnings Date: Fri, 14 Jul 2017 14:07:12 +0200 Message-Id: <20170714120720.906842-21-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170714120720.906842-1-arnd@arndb.de> References: <20170714120720.906842-1-arnd@arndb.de> X-Provags-ID: V03:K0:2a1qiNGsbAz+JEP9EFtVZDTtmPufZMk4TbnjrydLFs5DBmyzI++ tVSQVWwC1ihUgzcq+rp0h/2jLP08DGUN0u0mKtIyAHHmi/Xzmo+w9/7kGFBC12JT9ugaZmF b++HUv1eT11pmrh9yqmF1qpI8XpEQLOrWSTqqhmRZ9kLTUFfcbUUvPiF+f1yLKWgWfxwFja mV0zuljx9d4h3kzL5uyFA== X-UI-Out-Filterresults: notjunk:1; V01:K0:jfugXBTu1WQ=:uNxZb6LTb+ztV3hUL9OUI1 /35GBaaaqtA+sENUWG/ZEksLAlJnBME83K22IiZdFLCh/jfFx/omBhOFqwEauiXO0DPG0+0xa zG4jNkhW13cNPQPM8l9XU0lwbY6f/q3gu8lVmBgBMDz9HyAoBCwLO8z+owvXppuoAAQKddZmY NrHpBoYO4HR7zdig9AIH6rdmsfCiXuFI6Et4r+pk+P1x8FE0tRvsFWorX+Ojr4BQaKVys2EYz Y4fersyf0Ho23KoQumnc+Jwv5KKhT2L7z4ZSojhC+F5Xay0Ic1SsidkSNvbhvpAT97WHebrze Ls8MG2zqfecnVd70dkTvupmEgl0AuTz0kLsRztyMhuEzgifGvA0TwM7HZim3Pbe+NZzFdZ447 +gRfxY4DGLvo5R3IIXslcKb0F0T7/oHdlWtyeDf5rg6g7HTTXFAL7W/OWnaXp0Y/sNA1CJIYI SiR9e0/2Gj3DpaHnsVipj4aVrmHSJE3gNmAvMLQOeBs3gZxD27X143IAKFZFfMGvqVPppNESP RPeBQ4T1RhNZcScybwnC8fvK35vzNaJkivM7DcxUPHrZbPwIJzLAlIWSu3yFB121JnoLNZQx2 8RdJ8FONuqLPN5bnrnXcvnEe3z4h29j7ZcsaDJTTUDocvqo+wm2mik3oy8rWOn/J7TRQMWerO j9kiHEGy4l0AU/fZXPEIr+pTnZGq1HJvwaIH6Bz8yMAi3d2KNAt3aBqE+/1R9U3N8NWaTlsHm q8S+1+vTHE+0RpJwcAtcpKmzf6sjcYYdbW3aaw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org With gcc-7, we get various warnings about a possible string overflow: sound/pci/rme9652/hdspm.c: In function 'snd_hdspm_create_alsa_devices': sound/pci/rme9652/hdspm.c:2123:17: error: ' MIDIoverMADI' directive writing 13 bytes into a region of size between 1 and 32 [-Werror=format-overflow=] sound/pci/pcxhr/pcxhr.c: In function 'pcxhr_probe': sound/pci/pcxhr/pcxhr.c:1647:28: error: ' [PCM #' directive writing 7 bytes into a region of size between 1 and 32 [-Werror=format-overflow=] sound/pci/mixart/mixart.c: In function 'snd_mixart_probe': sound/pci/mixart/mixart.c:1353:28: error: ' [PCM #' directive writing 7 bytes into a region of size between 1 and 32 [-Werror=format-overflow=] sprintf(card->shortname, "%s [PCM #%d]", mgr->shortname, i); ^~~~~~~~~~~~~~ sound/pci/mixart/mixart.c:1353:28: note: using the range [-2147483648, 2147483647] for directive argument sound/pci/mixart/mixart.c:1353:3: note: 'sprintf' output between 10 and 51 bytes into a destination of size 32 sprintf(card->shortname, "%s [PCM #%d]", mgr->shortname, i); ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ sound/pci/mixart/mixart.c:1354:27: error: ' [PCM #' directive writing 7 bytes into a region of size between 1 and 80 [-Werror=format-overflow=] sprintf(card->longname, "%s [PCM #%d]", mgr->longname, i); ^~~~~~~~~~~~~~ sound/pci/mixart/mixart.c:1354:27: note: using the range [-2147483648, 2147483647] for directive argument sound/pci/mixart/mixart.c:1354:3: note: 'sprintf' output between 10 and 99 bytes into a destination of size 80 I have checked these all and found that the driver-private shortname strings for mixart and pcxhr are longer than necessary, and making them shorter will be safe while also making it clear that no overflow can happen when they get passed as a substring into the card shortname. For hdspm, we have a local buffer of the same size as its substring. In this case, making the buffer a little longer is safe as the functions that take it as an argument all use length checking and the strings we pass into it are actually short enough. Signed-off-by: Arnd Bergmann --- sound/pci/mixart/mixart.h | 4 ++-- sound/pci/pcxhr/pcxhr.h | 4 ++-- sound/pci/rme9652/hdspm.c | 2 +- 3 files changed, 5 insertions(+), 5 deletions(-) -- 2.9.0 diff --git a/sound/pci/mixart/mixart.h b/sound/pci/mixart/mixart.h index 426743871540..c8309e327663 100644 --- a/sound/pci/mixart/mixart.h +++ b/sound/pci/mixart/mixart.h @@ -75,8 +75,8 @@ struct mixart_mgr { struct mem_area mem[2]; /* share the name */ - char shortname[32]; /* short name of this soundcard */ - char longname[80]; /* name of this soundcard */ + char shortname[16]; /* short name of this soundcard */ + char longname[40]; /* name of this soundcard */ /* one and only blocking message or notification may be pending */ u32 pending_event; diff --git a/sound/pci/pcxhr/pcxhr.h b/sound/pci/pcxhr/pcxhr.h index 9e39e509a3ef..4909a43ce3d9 100644 --- a/sound/pci/pcxhr/pcxhr.h +++ b/sound/pci/pcxhr/pcxhr.h @@ -75,8 +75,8 @@ struct pcxhr_mgr { unsigned long port[3]; /* share the name */ - char shortname[32]; /* short name of this soundcard */ - char longname[96]; /* name of this soundcard */ + char shortname[16]; /* short name of this soundcard */ + char longname[40]; /* name of this soundcard */ struct pcxhr_rmh *prmh; diff --git a/sound/pci/rme9652/hdspm.c b/sound/pci/rme9652/hdspm.c index 254c3d040118..a1cbf5938a0e 100644 --- a/sound/pci/rme9652/hdspm.c +++ b/sound/pci/rme9652/hdspm.c @@ -2061,7 +2061,7 @@ static int snd_hdspm_create_midi(struct snd_card *card, struct hdspm *hdspm, int id) { int err; - char buf[32]; + char buf[64]; hdspm->midi[id].id = id; hdspm->midi[id].hdspm = hdspm; From patchwork Fri Jul 14 12:07:13 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 107798 Delivered-To: patch@linaro.org Received: by 10.182.45.195 with SMTP id p3csp894773obm; Fri, 14 Jul 2017 05:15:11 -0700 (PDT) X-Received: by 10.98.201.75 with SMTP id k72mr4848048pfg.99.1500034511641; Fri, 14 Jul 2017 05:15:11 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1500034511; cv=none; d=google.com; s=arc-20160816; b=lFuYgWV4blobgZ4rkGZrl/BnB2mX712rXRYG5oG3B+CS+L7sZ3qRLcBn9Lb9Qk4mgT NNNLjYYq6dZOaBmm0g54TdlDoRHWsJgCH+e1JnTsHok6z4IdiPD1oM/EHWTEn10dM539 LxKVeqGCEfPpg2J3ach4cz6b/MffuxywDNic4WoK/vNIT8+qeK+78FWfFtwGEoDL6RIl wUe6NPKwA6s3KRRGNCRutKFD7Hdduq3fZ0ugAPsuhQhjA2xIz61VxaRZjYv5NAiNGxta A+pS58+K5kwjpJWu/RrP1Ad1Q6W46wVN6zqYAFcq56sD7DjQVMwkGnBQo/m0HeZSGhkj dx7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=OjI+kFHpm8PnvsbblbYl3MYJrY7WbN9wbokYJJ2fr00=; b=TYp5Q3EbR+D9BP2HhXCNw2ISEkjGJIZRU+D3C7N7EMaVObZ8b+RD5uhqOsf8PaPeYO hgVc8GFVKonbssTSDc/GiKXiB0m0e2jKLj0a2VSU3/7V+yGldN97/FWA4tDR82xCzr2o pRRfvHcyEUGwYI1qY4tsgsgfs1rgI3uExWVrqLhgAR+0I/feA38DuxSTawegVIKU8GBQ hpSffHpSIoKJ/7sXIVzqCE8DnHKw24eYCx1Bbd4vRtiCpukfq091W8S8dVEZFGnvxUnz ZgdJN+6P1LKq6hFTBcHcxAJL5OurRmRzlXoin7LwiJ1MsZy2OTgTi9+SgAiRqEQMEIw3 VvfA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id i14si6123201pgn.378.2017.07.14.05.15.11; Fri, 14 Jul 2017 05:15:11 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932278AbdGNMOn (ORCPT + 25 others); Fri, 14 Jul 2017 08:14:43 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:62281 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754032AbdGNMOk (ORCPT ); Fri, 14 Jul 2017 08:14:40 -0400 Received: from wuerfel.lan ([5.56.224.194]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.145]) with ESMTPA (Nemesis) id 0MUEV8-1d6B743evC-00Qxlt; Fri, 14 Jul 2017 14:13:21 +0200 From: Arnd Bergmann To: linux-kernel@vger.kernel.org, David Howells Cc: Greg Kroah-Hartman , Linus Torvalds , Guenter Roeck , akpm@linux-foundation.org, netdev@vger.kernel.org, "David S . Miller" , "James E . J . Bottomley" , "Martin K . Petersen" , linux-scsi@vger.kernel.org, x86@kernel.org, Arnd Bergmann , James Morris , linux-cachefs@redhat.com Subject: [PATCH 21/22] fscache: fix fscache_objlist_show format processing Date: Fri, 14 Jul 2017 14:07:13 +0200 Message-Id: <20170714120720.906842-22-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170714120720.906842-1-arnd@arndb.de> References: <20170714120720.906842-1-arnd@arndb.de> X-Provags-ID: V03:K0:YFZAzTJTor7ESab3x/y3CyF9Q0zEzuiRH9Ykov65kfR3TBb9zUd vVqKVFgW1jv4QCOOlXlH6EZSRpLhZHHhMd7LEGHfLTrbO2E+moOVlnsDqK5NKhsU9hE8km1 8uiMAmVC2j2i8d9eN4PgLGZxDKIo0jkoMDedxvX+Et6LE7pJygNR3ZyOqZTkq1mXpmKk6q6 NCihx9jYG+hBLkcxrN2BQ== X-UI-Out-Filterresults: notjunk:1; V01:K0:mA5l/ZB/hlo=:ufIqD9IA8RqJFDyMte9BQf 3EWLpdMT57DBQhD7uqriIn3QNIpkNIRLlBbvCggp6NmLUKT87ENkFF107WPs365c5QmJgEmh8 zUcjjqm42upAPXhZGQhsNLa80SY+S99hR9h6Q14rCtLkSqZTKJfRhHE4UyvZQJG8smt847GAE axni8LB2rfMH3IEb0D2J74i5whbcblgtwzamVx700yazrC7fxpI+kkaj9vLamRikqSo6kZ3jS Zk1K5SV0g20SKH2awp+EKcABof4T22M58Qu+EnzWgiqTEnxHky61n796jp91hfBA5sj6CGH7y 9Q+kAwv81XB5pwNs/MnyetLSVJFFpIpjOCwHtm1BLrWcCezSRE4hk2ngUsVbJV6D9MVTv+TFp NW7Oa1JlfHYkCnTyZmJlVfRrYzYMTFHpOtuPzWUd5NFmFc+Wo/+eJCZtrrlmrXMDUQLPQ6hVr nluYs/iJ+WEsgdU9DDjn9oMNvCB1HKU0vSMcXoTJhCvFKRAf+Q2/5I3rkLv43whDaimI3qL03 2VjQs63eEpYIMTAueEK1g8nZLEcRrwvRMlUho/O4Avw3BDEI4hTZrxOEci/Px77dODC9drwR0 jOpIHq6jGRkwz85bFKGyg5IQcx8tjZ1ZRAo00DE+9snEg9SCCa1MaI8BUMKRVrHbTB8phdCoW k6fukTwOX5//tKUkLhWd6QaE7/1W1ifnfPDgAGSP8h7+y5yDFsH/kTLeJ/Iq9xImIFtAHxl8b gZYuksucjUt4slRZ2n3qUSPoFAdnlgoi6/lHWw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org gcc points out a minor bug in the handling of unknown cookie types, which could result in a string overflow when the integer is copied into a 3-byte string: fs/fscache/object-list.c: In function 'fscache_objlist_show': fs/fscache/object-list.c:265:19: error: 'sprintf' may write a terminating nul past the end of the destination [-Werror=format-overflow=] sprintf(_type, "%02u", cookie->def->type); ^~~~~~ fs/fscache/object-list.c:265:4: note: 'sprintf' output between 3 and 4 bytes into a destination of size 3 This is currently harmless as no code sets a type other than 0 or 1, but it makes sense to use snprintf() here to avoid overflowing the array if that changes. Signed-off-by: Arnd Bergmann --- fs/fscache/object-list.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) -- 2.9.0 diff --git a/fs/fscache/object-list.c b/fs/fscache/object-list.c index 67f940892ef8..b5ab06fabc60 100644 --- a/fs/fscache/object-list.c +++ b/fs/fscache/object-list.c @@ -262,7 +262,8 @@ static int fscache_objlist_show(struct seq_file *m, void *v) type = "DT"; break; default: - sprintf(_type, "%02u", cookie->def->type); + snprintf(_type, sizeof(_type), "%02u", + cookie->def->type); type = _type; break; }