From patchwork Thu Mar 1 15:22:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130242 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2934145edc; Thu, 1 Mar 2018 07:24:29 -0800 (PST) X-Google-Smtp-Source: AG47ELuNAulUSXeA9jXKMbBlsp1K31hnUW5b26mNxtN0mMpUG2t1hJinMAwK65yaQ8LwqzflH2x/ X-Received: by 2002:a17:902:b187:: with SMTP id s7-v6mr2272105plr.448.1519917868911; Thu, 01 Mar 2018 07:24:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519917868; cv=none; d=google.com; s=arc-20160816; b=pxnIVTNfzzqj0kC/FNQyXpk0cuE6OG5XXHIyvTl7lgLA24n1jXwL6JcoEy6c7cT1AD Agcst0tMURNdXqsASmCGhBFFJpyqJYC6rAnD0Uz5pNp3gabt0VsGgHkXg5xL/KuP+def iqlFA4+f9jrlwsfPIM/vkc8/oD3rtupk6uac5j9nwXQukAP76Vic2lwJ4kWnSluMwoSo EwXPSLOxInMyoGpsMtVROMszDlH8nU4OcX2hftoiJsyDCi6Fw6ybKZO0F4m/ALwXTtly 1as0AVRm/umX/jOW5W1CwFY2+4qIWMG8SdrWg5ni46uj+HD5shiS2X/MouWqL6kdISrr gLvg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:content-transfer-encoding :spamdiagnosticmetadata:spamdiagnosticoutput:content-language :accept-language:in-reply-to:references:message-id:date:thread-index :thread-topic:subject:cc:to:from:dkim-signature :arc-authentication-results; bh=5GQYYtM1hWkdA0ZR6IKKcpcR0VZOKp+DryIZYQkbG4Y=; b=NrGZtWJZhN8rirXYDL1XPLvQd3n+YjYueneWzUqtgmlsRGuppjeeRtnbKU6QkcPdZ9 NvEJ2OdZqEb/0cuyviSTC8B3PNzejyk/8atJvEVwqE8dOxr3UiHLUbYF3/H/v2Vc5IZn TmEws8caFO3yUnb65NfBd1/KIzCGq/ulqKeUkFDZyYGyZckgGyMVIiykvsVhR5HjuEQC GnoG0+l7orPIW9FEzBBtCLTxxcC2yj1nEUWqiJVveKf1ccXba0wXBcwTrQuXDjH30KIN vrNGDJjt1zOW7ApO8zQHptoNN634j2UeLUNkh4oVazwyooeLK2+MkKVw/XvCXeIVyiyX YEOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=n4iDsWfg; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id b72si3177910pfk.10.2018.03.01.07.24.28; Thu, 01 Mar 2018 07:24:28 -0800 (PST) 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; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=n4iDsWfg; 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; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=microsoft.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1031931AbeCAPY1 (ORCPT + 10 others); Thu, 1 Mar 2018 10:24:27 -0500 Received: from mail-bn3nam01on0094.outbound.protection.outlook.com ([104.47.33.94]:25184 "EHLO NAM01-BN3-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1031932AbeCAPYS (ORCPT ); Thu, 1 Mar 2018 10:24:18 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=5GQYYtM1hWkdA0ZR6IKKcpcR0VZOKp+DryIZYQkbG4Y=; b=n4iDsWfge7zZDzNMD+fk9zzlAjHpa95mvJqNY5lJlPLZklsmkumZtglPe2VTYeXSt0RqxCpzZCmshevb61ebmwQb3x57Ro0z6YeYUm2EvPCV6XbY/PZivY4LcHo08UxQxh0ny6kgqVEDwz+Hy3sB2qF6T2sRT9q4ZCqwk/el5jk= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB1095.namprd21.prod.outlook.com (52.132.130.17) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.567.2; Thu, 1 Mar 2018 15:24:15 +0000 Received: from DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446]) by DM5PR2101MB1032.namprd21.prod.outlook.com ([fe80::8063:c68a:b210:7446%2]) with mapi id 15.20.0567.006; Thu, 1 Mar 2018 15:24:15 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Arnd Bergmann , "David S . Miller" , Sasha Levin Subject: [added to the 4.1 stable tree] isdn: kcapi: avoid uninitialized data Thread-Topic: [added to the 4.1 stable tree] isdn: kcapi: avoid uninitialized data Thread-Index: AQHTsXEp5ZMCNM4L4kSkuq5hTMsWTQ== Date: Thu, 1 Mar 2018 15:22:51 +0000 Message-ID: <20180301152116.1486-40-alexander.levin@microsoft.com> References: <20180301152116.1486-1-alexander.levin@microsoft.com> In-Reply-To: <20180301152116.1486-1-alexander.levin@microsoft.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [52.168.54.252] x-ms-publictraffictype: Email x-microsoft-exchange-diagnostics: 1; DM5PR2101MB1095; 7:ysvDa7QxK9tj+FqjiNczu8xk/SNXWsq2p2MskprxSfktWeoE5dJNXhltFCfVWiwQL9Vq1MKXkiXyAdZmV4uLpTmuQgFbVGc4aYgGWQtMmX95FtUEGboapgO1RLhmtp2aNVu25x5+3goPkYCHwvuHNDwwz+4W2t95uIpf57scN6HAlS0u5RsJOVPsgVOk0wrmaivZSHdTxWL5WvltgmtPABz/4+E+lSNpNb5aR73/nZIuDeY4MLvL8YzkZT9+dWWv x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 05b919f8-cf4e-431e-d02a-08d57f887e8f x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020); SRVR:DM5PR2101MB1095; x-ms-traffictypediagnostic: DM5PR2101MB1095: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(5005006)(8121501046)(10201501046)(93006095)(93001095)(3002001)(3231220)(944501224)(52105095)(6055026)(61426038)(61427038)(6041288)(20161123562045)(20161123560045)(20161123558120)(20161123564045)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(6072148)(201708071742011); SRVR:DM5PR2101MB1095; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB1095; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(346002)(376002)(396003)(39860400002)(39380400002)(189003)(199004)(26005)(3846002)(6116002)(1076002)(72206003)(110136005)(54906003)(25786009)(106356001)(5660300001)(316002)(36756003)(3280700002)(10290500003)(186003)(7736002)(478600001)(10090500001)(6346003)(2900100001)(2906002)(102836004)(86612001)(86362001)(99286004)(2950100002)(97736004)(6512007)(53936002)(6506007)(14454004)(66066001)(305945005)(22452003)(81156014)(81166006)(3660700001)(107886003)(6486002)(59450400001)(6436002)(76176011)(5250100002)(4326008)(68736007)(8676002)(8936002)(2501003)(6666003)(105586002)(22906009); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB1095; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; received-spf: None (protection.outlook.com: microsoft.com does not designate permitted sender hosts) authentication-results: spf=none (sender IP is ) smtp.mailfrom=Alexander.Levin@microsoft.com; x-microsoft-antispam-message-info: pYS67Q59ZEpLQKInArpnXBHZHctpLxtW4TNCCy3/ZrZK1imvG1VFkdFwt5VJOfuECxigHJ2wKIYsj+6NIGwK1nDkF3Bl/eMKqPPgFsttKWlJvlA1jajSoZK/r6VyUTJHLskxoS7Hrquo8JXBtkCFJZ/qAzQDNyZe0e0Rh4NvqLU= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 05b919f8-cf4e-431e-d02a-08d57f887e8f X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:22:51.2116 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB1095 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Arnd Bergmann This patch has been added to the 4.1 stable tree. If you have any objections, please let us know. -- 2.14.1 =============== [ Upstream commit af109a2cf6a9a6271fa420ae2d64d72d86c92b7d ] gcc-7 points out that the AVMB1_ADDCARD ioctl results in an unintialized value ending up in the cardnr parameter: drivers/isdn/capi/kcapi.c: In function 'old_capi_manufacturer': drivers/isdn/capi/kcapi.c:1042:24: error: 'cdef.cardnr' may be used uninitialized in this function [-Werror=maybe-uninitialized] cparams.cardnr = cdef.cardnr; This has been broken since before the start of the git history, so either the value is not used for anything important, or the ioctl command doesn't get called in practice. Setting the cardnr to zero avoids the warning and makes sure we have consistent behavior. Signed-off-by: Arnd Bergmann Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/isdn/capi/kcapi.c | 1 + 1 file changed, 1 insertion(+) diff --git a/drivers/isdn/capi/kcapi.c b/drivers/isdn/capi/kcapi.c index 823f6985b260..dd7e38ac29bd 100644 --- a/drivers/isdn/capi/kcapi.c +++ b/drivers/isdn/capi/kcapi.c @@ -1032,6 +1032,7 @@ static int old_capi_manufacturer(unsigned int cmd, void __user *data) sizeof(avmb1_carddef)))) return -EFAULT; cdef.cardtype = AVM_CARDTYPE_B1; + cdef.cardnr = 0; } else { if ((retval = copy_from_user(&cdef, data, sizeof(avmb1_extcarddef))))