From patchwork Sat Mar 17 10:03:31 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karsten Keil X-Patchwork-Id: 154513 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by ozlabs.org (Postfix) with ESMTP id D9D80B6EEB for ; Tue, 24 Apr 2012 03:10:14 +1000 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754718Ab2DWRKA (ORCPT ); Mon, 23 Apr 2012 13:10:00 -0400 Received: from moutng.kundenserver.de ([212.227.17.9]:52887 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754176Ab2DWRIW (ORCPT ); Mon, 23 Apr 2012 13:08:22 -0400 Received: from mailone.linux-pingi.de (p5497CD69.dip.t-dialin.net [84.151.205.105]) by mrelayeu.kundenserver.de (node=mreu3) with ESMTP (Nemesis) id 0LmAhq-1Rna9x3XXO-00ZtyT; Mon, 23 Apr 2012 19:08:20 +0200 Received: from pingi6.linux-pingi.de (pingi6.linux-pingi.de [10.23.200.6]) by mailone.linux-pingi.de (Postfix) with ESMTP id AC8084FD6; Mon, 23 Apr 2012 19:08:16 +0200 (CEST) Received: by pingi6.linux-pingi.de (Postfix, from userid 1000) id E7B489FB98; Mon, 23 Apr 2012 19:05:49 +0200 (CEST) Date: Sat, 17 Mar 2012 11:03:31 +0100 Subject: [PATCH 08/28] mISDN: Fix division by zero From: Karsten Keil To: David Miller Cc: netdev@vger.kernel.org, isdn4linux@listserv.isdn4linux.de Message-Id: <20120423170549.E7B489FB98@pingi6.linux-pingi.de> X-Provags-ID: V02:K0:bcgs36To9jLxw0STyILB6J3HJE2+25LXFCHc7fcMrGm Cq1XdaiJIPEP5qOkrLpd9BjpMtArTIq/V6NKtsE1RLb3op2cDx caqp1tHfLSCvxqnBnd0q2pkQXt3fk4KxOlm/68c1B7mCDGIhta W8Dh1IpQQD/zOS0YxrUz6/O6ztDNluICCZ5gwWwXxHu2k7HzX9 B4dVQTXqoRZRHWhlSbxExqndkvd++2v+pJ6PU1CPz7xQGKxzFj CFL6W6iV7d0SnPKWAbOBswmLn8i8j8TkM5QbtlwFMYkodICzdH 8jTbJbhriJ5x3c21Nmgkp9wrOQM0dcrO5NW069jVRtTMfa5jHw cUSSTZj0pnxwTRqahYmWp3UHUlrEqdUXYfk1sF/nWZQ69pTITq 8hGWkDf/sMxlFn4Y/CyNGWekIUJu57jXJQ= Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org If DTMF debug is set and tresh goes under 100, the printk will cause a division by zero. Signed-off-by: Karsten Keil --- drivers/isdn/mISDN/dsp_dtmf.c | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) diff --git a/drivers/isdn/mISDN/dsp_dtmf.c b/drivers/isdn/mISDN/dsp_dtmf.c index 887860b..642f30b 100644 --- a/drivers/isdn/mISDN/dsp_dtmf.c +++ b/drivers/isdn/mISDN/dsp_dtmf.c @@ -222,16 +222,25 @@ coefficients: goto storedigit; } - if (dsp_debug & DEBUG_DSP_DTMFCOEFF) + if (dsp_debug & DEBUG_DSP_DTMFCOEFF) { + s32 tresh_100 = tresh/100; + + if (tresh_100 == 0) { + tresh_100 = 1; + printk(KERN_DEBUG + "tresh(%d) too small set tresh/100 to 1\n", + tresh); + } printk(KERN_DEBUG "a %3d %3d %3d %3d %3d %3d %3d %3d" " tr:%3d r %3d %3d %3d %3d %3d %3d %3d %3d\n", result[0] / 10000, result[1] / 10000, result[2] / 10000, result[3] / 10000, result[4] / 10000, result[5] / 10000, result[6] / 10000, result[7] / 10000, tresh / 10000, - result[0] / (tresh / 100), result[1] / (tresh / 100), - result[2] / (tresh / 100), result[3] / (tresh / 100), - result[4] / (tresh / 100), result[5] / (tresh / 100), - result[6] / (tresh / 100), result[7] / (tresh / 100)); + result[0] / (tresh_100), result[1] / (tresh_100), + result[2] / (tresh_100), result[3] / (tresh_100), + result[4] / (tresh_100), result[5] / (tresh_100), + result[6] / (tresh_100), result[7] / (tresh_100)); + } /* calc digit (lowgroup/highgroup) */ lowgroup = -1;