From patchwork Tue May 9 23:23:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kees Cook X-Patchwork-Id: 9719013 X-Patchwork-Delegate: kvalo@adurom.com Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 455EE60237 for ; Tue, 9 May 2017 23:23:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 3731728459 for ; Tue, 9 May 2017 23:23:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2BE9F28471; Tue, 9 May 2017 23:23:49 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_HI autolearn=unavailable version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 336D12847D for ; Tue, 9 May 2017 23:23:47 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751154AbdEIXXi (ORCPT ); Tue, 9 May 2017 19:23:38 -0400 Received: from mail-pf0-f176.google.com ([209.85.192.176]:36025 "EHLO mail-pf0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1750780AbdEIXXg (ORCPT ); Tue, 9 May 2017 19:23:36 -0400 Received: by mail-pf0-f176.google.com with SMTP id m17so7007583pfg.3 for ; Tue, 09 May 2017 16:23:36 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=chromium.org; s=google; h=date:from:to:cc:subject:message-id:mime-version:content-disposition; bh=lllo1Qr6KGoeKf2Ehfdbr0hdlXZf609WJ6+WcKcaxGc=; b=XtIoMf8lOgULUfEgVY/OzCudkW5kYu0WymTSZNVcnRvOIW0MJBr5rEa5qxW8VesBWx A6EZjXbC4WCENJX7/N1oIcKii4gLFPYsMBADU6/wbQYh0G7DViJegKqusbFFclpSy1jB d2eEBge/08n0Ged9fk0CpfhyxGeY2AbKsKONw= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:date:from:to:cc:subject:message-id:mime-version :content-disposition; bh=lllo1Qr6KGoeKf2Ehfdbr0hdlXZf609WJ6+WcKcaxGc=; b=AoyZKYqqDlqyJ6lZiakmrQd1bVhO5Xlmj0ESaD0lZ6c5gzHzBYH7fehQCmN4JHOSyt rmOIfqIfyU8XLIa9n1wcjl7ceXvKBd77QVAycdOY5e20xDlh67B0PdwzhQLnQGpjeau0 6vgx/ytOSmrdqh/nDtEcb520HGBQk3pLxopQ3IJr2BVnx0z9l+5w91JvnFiX1/DaYObr bBuYwTWEKss+hcQ6ALRdIT7/qVqzuOL99Y8nItiV+8W7DojNY9Oh7CRYeJLbfijcHiMe fP6TUOfKD0CJa9o7rl2X5wp4xromdPo9YLv+zycKH3Bz8UPBWAPEVXXXzcKPp8Cc9+P7 q9qg== X-Gm-Message-State: AODbwcDP/Sm419ktCrNSgfqjM70jiDfjYTB6arx5BvFdfaoirq4eQIC0 glklyrbqR2LekEfa X-Received: by 10.99.64.1 with SMTP id n1mr2968051pga.197.1494372215987; Tue, 09 May 2017 16:23:35 -0700 (PDT) Received: from www.outflux.net (173-164-112-133-Oregon.hfc.comcastbusiness.net. [173.164.112.133]) by smtp.gmail.com with ESMTPSA id k23sm1828491pgn.11.2017.05.09.16.23.35 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 09 May 2017 16:23:35 -0700 (PDT) Date: Tue, 9 May 2017 16:23:34 -0700 From: Kees Cook To: netdev@vger.kernel.org Cc: Kalle Valo , libertas-dev@lists.infradead.org, linux-wireless@vger.kernel.org, linux-kernel@vger.kernel.org, Daniel Micay Subject: [PATCH] libertas: Avoid reading past end of buffer Message-ID: <20170509232334.GA55070@beast> MIME-Version: 1.0 Content-Disposition: inline Sender: linux-wireless-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-wireless@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Using memcpy() from a string that is shorter than the length copied means the destination buffer is being filled with arbitrary data from the kernel rodata segment. Instead, use strncpy() which will fill the trailing bytes with zeros. Additionally adjust indentation to keep checkpatch.pl happy. This was found with the future CONFIG_FORTIFY_SOURCE feature. Cc: Daniel Micay Signed-off-by: Kees Cook --- drivers/net/wireless/marvell/libertas/mesh.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/drivers/net/wireless/marvell/libertas/mesh.c b/drivers/net/wireless/marvell/libertas/mesh.c index d0c881dd5846..d0b1948ca242 100644 --- a/drivers/net/wireless/marvell/libertas/mesh.c +++ b/drivers/net/wireless/marvell/libertas/mesh.c @@ -1177,9 +1177,9 @@ void lbs_mesh_ethtool_get_strings(struct net_device *dev, switch (stringset) { case ETH_SS_STATS: for (i = 0; i < MESH_STATS_NUM; i++) { - memcpy(s + i * ETH_GSTRING_LEN, - mesh_stat_strings[i], - ETH_GSTRING_LEN); + strncpy(s + i * ETH_GSTRING_LEN, + mesh_stat_strings[i], + ETH_GSTRING_LEN); } break; }