From patchwork Mon Mar 15 14:48:05 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Karsten Keil X-Patchwork-Id: 47761 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 B34B2B7D85 for ; Tue, 16 Mar 2010 01:57:34 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S965132Ab0COO4s (ORCPT ); Mon, 15 Mar 2010 10:56:48 -0400 Received: from moutng.kundenserver.de ([212.227.126.171]:57214 "EHLO moutng.kundenserver.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965126Ab0COO4p (ORCPT ); Mon, 15 Mar 2010 10:56:45 -0400 Received: from pingi (p5497DF17.dip.t-dialin.net [84.151.223.23]) by mrelayeu.kundenserver.de (node=mrbap2) with ESMTP (Nemesis) id 0M83Dl-1NVYEr2FuL-00wENt; Mon, 15 Mar 2010 15:56:40 +0100 MIME-Version: 1.0 Subject: Re: [2/3] gigaset: correct clearing of at_state strings on RING Date: Mon, 15 Mar 2010 14:48:05 -0000 To: Tilman Schmidt From: Karsten Keil Cc: David Miller , netdev@vger.kernel.org, linux-kernel@vger.kernel.org, stable@vger.kernel.org, isdn4linux , Hansjoerg Lipp , i4ldeveloper Message-Id: <1268665000.25612@pingi> X-Provags-ID: V01U2FsdGVkX1/0dZjl762MOvocQoCG2lz2Gb4df4llK731bjA m5gISROBw40ZGsbEsbLgLyxpt/p5FNB1L8NI/pJipPY6BiBzRJ Vz//cLGvv+aRNL8AdPXNlqrXeA+aU28 Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org In RING handling, clear the table of received parameter strings in a loop like everywhere else, instead of by enumeration which had already gotten out of sync. Impact: minor bugfix Signed-off-by: Tilman Schmidt Acked-by: Karsten Keil --- Note to -stable: applies correctly to 2.6.33. drivers/isdn/gigaset/ev-layer.c | 12 ++++-------- 1 files changed, 4 insertions(+), 8 deletions(-) -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/drivers/isdn/gigaset/ev-layer.c b/drivers/isdn/gigaset/ev-layer.c index c8f89b7..206c380 100644 --- a/drivers/isdn/gigaset/ev-layer.c +++ b/drivers/isdn/gigaset/ev-layer.c @@ -1258,14 +1258,10 @@ static void do_action(int action, struct cardstate *cs, * note that bcs may be NULL if no B channel is free */ at_state2->ConState = 700; - kfree(at_state2->str_var[STR_NMBR]); - at_state2->str_var[STR_NMBR] = NULL; - kfree(at_state2->str_var[STR_ZCPN]); - at_state2->str_var[STR_ZCPN] = NULL; - kfree(at_state2->str_var[STR_ZBC]); - at_state2->str_var[STR_ZBC] = NULL; - kfree(at_state2->str_var[STR_ZHLC]); - at_state2->str_var[STR_ZHLC] = NULL; + for (i = 0; i < STR_NUM; ++i) { + kfree(at_state2->str_var[i]); + at_state2->str_var[i] = NULL; + } at_state2->int_var[VAR_ZCTP] = -1; spin_lock_irqsave(&cs->lock, flags);