From patchwork Fri May 5 19:47:28 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arnd Bergmann X-Patchwork-Id: 98707 Delivered-To: patch@linaro.org Received: by 10.140.96.100 with SMTP id j91csp292962qge; Fri, 5 May 2017 12:48:57 -0700 (PDT) X-Received: by 10.84.241.77 with SMTP id u13mr7152914plm.28.1494013737488; Fri, 05 May 2017 12:48:57 -0700 (PDT) Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id n5si2698005pgk.367.2017.05.05.12.48.57; Fri, 05 May 2017 12:48:57 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of stable-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 stable-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=stable-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755929AbdEETsz (ORCPT + 6 others); Fri, 5 May 2017 15:48:55 -0400 Received: from mout.kundenserver.de ([212.227.126.130]:51993 "EHLO mout.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755720AbdEETsj (ORCPT ); Fri, 5 May 2017 15:48:39 -0400 Received: from wuerfel.lan ([78.42.17.5]) by mrelayeu.kundenserver.de (mreue002 [212.227.15.129]) with ESMTPA (Nemesis) id 0Lnots-1dhyqN3ULY-00g15B; Fri, 05 May 2017 21:48:31 +0200 From: Arnd Bergmann To: Ben Hutchings Cc: stable@vger.kernel.org, Konrad Zapalowicz , Greg Kroah-Hartman , Arnd Bergmann Subject: [PATCH 3.16-stable 70/87] staging: dgnc: Fix frame size is larger than 1024B Date: Fri, 5 May 2017 21:47:28 +0200 Message-Id: <20170505194745.3627137-71-arnd@arndb.de> X-Mailer: git-send-email 2.9.0 In-Reply-To: <20170505194745.3627137-1-arnd@arndb.de> References: <20170505194745.3627137-1-arnd@arndb.de> X-Provags-ID: V03:K0:c/P8/ud6kh5r63dOAqpRyvcPNPH7sYfqG95IkT/+3ytwUGipg+j RxaZ9iHiWeKNGt/ghH5txwGNLH4koT+e4w15nHCQyV1yyro9IwVgq43VVMYRFVmm3vd8A7i zfpjKKLTxGQPFS/EolOd7vZolQJmeplgpnQyt2M3/v3ouYkuMjnK0J36BNf2Wc0zStTThsG pSQIjQq6+dz9NUlZq2v8A== X-UI-Out-Filterresults: notjunk:1; V01:K0:IFPyxd2H1yo=:s3M+WFR8E/4pbUTdVjcmGv jof4pV7jaiMVGM8T1C4C2DRjY8DoT3FweEE7tyA2a5+djnTSUWYrn6dGwyTME6QgA4o2/aM53 OTg25MG0kzT/NAek4QjnRF/qgZYrnOT7KLL4FQ4+044Alzgq6ONg0SgBdiIdki21mIFuR+igb mIHzlj2Rb8UOnwHXBYvd6JZCLFnXXCpTRfYjHyOqAdKNPgBJzS3zLvTHU95AFCLxhHmFH7ml1 0TaxWfFes/A1MK0//DzMzF+EMSDEpKzIj2YXiBdlA/DjFiaiwH+VSLN97aOez7KZ44ZunQGPR 5w0j0cUEH4N/K8SupIb3vn/7mhSwNl6tmWzctM17GT0rDdhUKHhoPgsZtC2b+ZFHfqtTdu9TC GlwjZE4F8ZPxAXjASAxytFLZEUh4jRwRMbq+IHbI9bzfDXAWxoOKUWH/J86Aj9uk/4bJb1JH8 AdUEJh1m9TYwNwX4Wxm/+tIrSlVNSPByYDa83e637UV9M/FLjkIj9WHYf7q+5KL78IdzCLFRz Ju1AQ1H0rg/4ZrUH6otZUrpFhdLu/pjWxb/vx/sGIaEGmwtArekJo9cssct/DungLZIJHz1gs JMYKn4joLl+ip0qZQfTyObDuhmamdgcDvHd7LwoOp8zgpu3JuSvwJ5waHoTiDA3koZfniPRUZ oFXkt8FCx3kxKyTKe5dDg9S2PdnplvThDKn52mBzxYYdygoQQdkQPLi1b9oyizAT37xc= Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Konrad Zapalowicz Commit 59939d1eaadbb374b04648a35ff5560db58afeba upstream. This comit fixes the following sparse warnign: drivers/staging/dgnc/dgnc_tty.c:572:1: warning: the frame size of 1060 bytes is larger than 1024 bytes [-Wframe-larger-than=] This was caused by having buffer as an automatic variable. This commit moves it from the stack to the heap. Signed-off-by: Konrad Zapalowicz Signed-off-by: Greg Kroah-Hartman Signed-off-by: Arnd Bergmann --- drivers/staging/dgnc/dgnc_tty.c | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) -- 2.9.0 diff --git a/drivers/staging/dgnc/dgnc_tty.c b/drivers/staging/dgnc/dgnc_tty.c index 4135cb0ed9f5..cd7a6dbdddb8 100644 --- a/drivers/staging/dgnc/dgnc_tty.c +++ b/drivers/staging/dgnc/dgnc_tty.c @@ -481,13 +481,18 @@ void dgnc_sniff_nowait_nolock(struct channel_t *ch, uchar *text, uchar *buf, int int nbuf; int i; int tmpbuflen; - char tmpbuf[TMPBUFLEN]; - char *p = tmpbuf; + char *tmpbuf; + char *p; int too_much_data; + tmpbuf = kzalloc(TMPBUFLEN, GFP_KERNEL); + if (!tmpbuf) + return; + p = tmpbuf; + /* Leave if sniff not open */ if (!(ch->ch_sniff_flags & SNIFF_OPEN)) - return; + goto exit; do_gettimeofday(&tv); @@ -534,7 +539,7 @@ void dgnc_sniff_nowait_nolock(struct channel_t *ch, uchar *text, uchar *buf, int * function was probably called by the interrupt/timer routines! */ if (n == 0) - return; + goto exit; /* * Copy as much data as will fit. @@ -579,6 +584,9 @@ void dgnc_sniff_nowait_nolock(struct channel_t *ch, uchar *text, uchar *buf, int } } while (too_much_data); + +exit: + kfree(tmpbuf); }