Received: by 2002:a6b:500f:0:0:0:0:0 with SMTP id e15csp1353737iob; Wed, 4 May 2022 22:16:07 -0700 (PDT) X-Google-Smtp-Source: ABdhPJx97p4b5VitUJPtr8HM5ieIY/VIkoqfwM0GEMAJCip+JvvnSVcAIBT95nN6JERtCUT0LJyq X-Received: by 2002:a17:902:6b0b:b0:158:f889:edd9 with SMTP id o11-20020a1709026b0b00b00158f889edd9mr25501618plk.122.1651727766946; Wed, 04 May 2022 22:16:06 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1651727766; cv=none; d=google.com; s=arc-20160816; b=aIdJ19DJUvgce2hxonGhAGibCsZR2hcwOkMyWAM3Sue8l/s/7+K1BkNxxsrTATNb9B JOwDQ6YBIm0PHxCIMdhfe1RhIOxDquHB1jfXUUsfI+12XIk5O6YGgpDxF1PAJSFTGRIr hK23WwD/KVhmCY+AWEnPKWsSePqYoSuXOJGZNpYgrwjwXCP7uEcbnVh6zVyvjv46RfMh sODMW/ifTBvWp07u6WHanK+x87XfEHC/aWQiwHDjrkPUUaYyl4aFJLOCiigQ/gXssXNx BcmGEGWoLgjDeSpLmP/1EfdWZhLWgoD8+vxO4lXFLVYBOVJsxIibqLiGhJfmxz6wY7SD MT1g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=agz6KGjcOcWiR7pLk9mfi+VUkUq+FhkssHNi6G1w1yk=; b=KdE5VjVFRG1rIISrRZsO/Hye13SUuzrZcc3zzw0KbsShRGvVL4LRdlmeQRLn0ORxgv URAQoCqk+MTlKOOQvvxMS2+du64D501v2HeFag0RdHgwZyM3pHFk6+DQo9ghapbDhiKS VP9yZVgE2Gp0oEz9a0lNyxnpphAiGQYmZMDbVjDof3HrEpGyw8UfEsgJ002H8On3Yo/P Ym0BLIRgxfagfVJ1ZzclS7ksQIhwW9YzSBmWiRs2WXJSoHoKEJzxIbqptDKv0PYoSc1K iFDWthNjWfVKhNopnbtAvgzaImRfxjxAFPAbRyMSoikfGnGvhKdli5ZjGUFnD2vL309s skmg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DNjYAW8Q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id go23-20020a17090b03d700b001da0b254615si6137564pjb.119.2022.05.04.22.15.37; Wed, 04 May 2022 22:16:06 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DNjYAW8Q; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1359189AbiEDRxA (ORCPT + 99 others); Wed, 4 May 2022 13:53:00 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:55368 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1358085AbiEDRPj (ORCPT ); Wed, 4 May 2022 13:15:39 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [IPv6:2604:1380:4601:e00::1]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8E2CC56419; Wed, 4 May 2022 09:59:22 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 0C3D9B8279A; Wed, 4 May 2022 16:59:21 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 8847BC385AA; Wed, 4 May 2022 16:59:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1651683559; bh=1RwLgbW1uY65NWobAxBjbLTwzhjAH6mhVMDFan1/tXE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DNjYAW8Qlt4jAm8/ufZQbVkmvZ3xaG05YqRIYyAzuCFhjJofYPRAv14R6wcOWQKqN LvSbTVdJmVEiTXXJgDGlfC9Ov9A+HxCRKRG8YSfLN3J16m1+d11nqRNL2HnpUNd46r rEVmtBUxzZMudR1Rqm5rAUidQpAHSPfsIGQp98+g= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, kernel test robot , Daniel Starke Subject: [PATCH 5.17 222/225] tty: n_gsm: fix sometimes uninitialized warning in gsm_dlci_modem_output() Date: Wed, 4 May 2022 18:47:40 +0200 Message-Id: <20220504153129.674725357@linuxfoundation.org> X-Mailer: git-send-email 2.36.0 In-Reply-To: <20220504153110.096069935@linuxfoundation.org> References: <20220504153110.096069935@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-7.7 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, SPF_HELO_NONE,SPF_PASS,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Daniel Starke commit 19317433057dc1f2ca9a975e4e6b547282c2a5ef upstream. 'size' may be used uninitialized in gsm_dlci_modem_output() if called with an adaption that is neither 1 nor 2. The function is currently only called by gsm_modem_upd_via_data() and only for adaption 2. Properly handle every invalid case by returning -EINVAL to silence the compiler warning and avoid future regressions. Fixes: c19ffe00fed6 ("tty: n_gsm: fix invalid use of MSC in advanced option") Cc: stable@vger.kernel.org Reported-by: kernel test robot Signed-off-by: Daniel Starke Link: https://lore.kernel.org/r/20220425104726.7986-1-daniel.starke@siemens.com Signed-off-by: Greg Kroah-Hartman --- drivers/tty/n_gsm.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) --- a/drivers/tty/n_gsm.c +++ b/drivers/tty/n_gsm.c @@ -932,18 +932,21 @@ static int gsm_dlci_modem_output(struct { u8 *dp = NULL; struct gsm_msg *msg; - int size; + int size = 0; /* for modem bits without break data */ - if (dlci->adaption == 1) { - size = 0; - } else if (dlci->adaption == 2) { - size = 1; + switch (dlci->adaption) { + case 1: /* Unstructured */ + break; + case 2: /* Unstructured with modem bits. */ + size++; if (brk > 0) size++; - } else { + break; + default: pr_err("%s: unsupported adaption %d\n", __func__, dlci->adaption); + return -EINVAL; } msg = gsm_data_alloc(gsm, dlci->addr, size, gsm->ftype);