From patchwork Mon Apr 9 21:07:47 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laura Abbott X-Patchwork-Id: 896421 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming-netdev@ozlabs.org Delivered-To: patchwork-incoming-netdev@ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=vger.kernel.org (client-ip=209.132.180.67; helo=vger.kernel.org; envelope-from=netdev-owner@vger.kernel.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=redhat.com Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id 40KjZL3PGZz9rxp for ; Tue, 10 Apr 2018 07:08:10 +1000 (AEST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754751AbeDIVH6 (ORCPT ); Mon, 9 Apr 2018 17:07:58 -0400 Received: from mail-pl0-f65.google.com ([209.85.160.65]:40889 "EHLO mail-pl0-f65.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754121AbeDIVH4 (ORCPT ); Mon, 9 Apr 2018 17:07:56 -0400 Received: by mail-pl0-f65.google.com with SMTP id x4-v6so5953132pln.7 for ; Mon, 09 Apr 2018 14:07:56 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=slZtPyz+LsNcXsDn+uhw0xVjtelCqKDeFDkVIZDhiBQ=; b=d2BZFp8dEN8G6Ju3sugOKkmYc/960mCx6GEMufPTMlNykspK4rNJ52AImk6DaBMUBt eprZERjmCpRrVqa/JS38SQ7pXYq3YcD6/tN6jAZeNi0Os07lCeQyefOBgtPzoNBaK/y0 7m27ItUxx12K2tm/zvuCHcW4JlFv7ECGaL7XjHkendmKEmLZDx5BLBDu9goZ33amc0kK ZG/F4TV66HulJyEuLTBkCOvgGpBG9egaqfGS3lT+aggrODv50b1q/8ade4U3rKp/FTwt 8j6rObCYm8ZGF6Tnqha1SHy5QGKxpfgLmjm1zyYcLPX7x29NtbVSyGBxtliceNppr5rR Lqhg== X-Gm-Message-State: AElRT7HWWey7R2CHCPYiS0MIMAoXvDPMpyO4el2PQBBO2oCQgiWQuQbr VdVgzCPt0Zt2xIixwRyBHtO6qA== X-Google-Smtp-Source: AIpwx4/AQMNU7GcLgrjn3OeZTlAtgzEtzrZ4TTyrbqp25J9NomvadCt056YZttXL9ORyY+QaWG63QA== X-Received: by 2002:a17:902:264:: with SMTP id 91-v6mr40424580plc.178.1523308075996; Mon, 09 Apr 2018 14:07:55 -0700 (PDT) Received: from labbott-redhat.redhat.com ([2601:602:9802:a8dc::1082]) by smtp.gmail.com with ESMTPSA id p86sm2877167pfi.55.2018.04.09.14.07.52 (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Mon, 09 Apr 2018 14:07:54 -0700 (PDT) From: Laura Abbott To: Karsten Keil , "David S. Miller" Cc: Laura Abbott , Kees Cook , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, kernel-hardening@lists.openwall.com Subject: [PATCH] mISDN: Remove VLAs Date: Mon, 9 Apr 2018 14:07:47 -0700 Message-Id: <20180409210747.3990-1-labbott@redhat.com> X-Mailer: git-send-email 2.14.3 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org There's an ongoing effort to remove VLAs[1] from the kernel to eventually turn on -Wvla. Remove the VLAs from the mISDN code by switching to using kstrdup in one place and just using the upper bound in another. [1] https://lkml.org/lkml/2018/3/7/621 Signed-off-by: Laura Abbott --- drivers/isdn/mISDN/dsp_hwec.c | 8 +++++--- drivers/isdn/mISDN/l1oip_core.c | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/drivers/isdn/mISDN/dsp_hwec.c b/drivers/isdn/mISDN/dsp_hwec.c index a6e87076acc2..5336bbdbfdc5 100644 --- a/drivers/isdn/mISDN/dsp_hwec.c +++ b/drivers/isdn/mISDN/dsp_hwec.c @@ -68,12 +68,12 @@ void dsp_hwec_enable(struct dsp *dsp, const char *arg) goto _do; { - char _dup[len + 1]; char *dup, *tok, *name, *val; int tmp; - strcpy(_dup, arg); - dup = _dup; + dup = kstrdup(arg, GFP_ATOMIC); + if (!dup) + return; while ((tok = strsep(&dup, ","))) { if (!strlen(tok)) @@ -89,6 +89,8 @@ void dsp_hwec_enable(struct dsp *dsp, const char *arg) deftaps = tmp; } } + + kfree(dup); } _do: diff --git a/drivers/isdn/mISDN/l1oip_core.c b/drivers/isdn/mISDN/l1oip_core.c index 21d50e4cc5e1..df594245deca 100644 --- a/drivers/isdn/mISDN/l1oip_core.c +++ b/drivers/isdn/mISDN/l1oip_core.c @@ -279,7 +279,7 @@ l1oip_socket_send(struct l1oip *hc, u8 localcodec, u8 channel, u32 chanmask, u16 timebase, u8 *buf, int len) { u8 *p; - u8 frame[len + 32]; + u8 frame[L1OIP_MAX_PERFRAME + 32]; struct socket *socket = NULL; if (debug & DEBUG_L1OIP_MSG)