From patchwork Thu Mar 1 15:26:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sasha Levin X-Patchwork-Id: 130259 Delivered-To: patch@linaro.org Received: by 10.80.172.228 with SMTP id x91csp2949140edc; Thu, 1 Mar 2018 07:35:51 -0800 (PST) X-Google-Smtp-Source: AG47ELvpNTzgq0x3Vu4Mh0sccxvFe1mfx8Dku/DiZkjqHxSpakL1uEX/xG75XfBuDFgWkibJ0RE0 X-Received: by 2002:a17:902:3001:: with SMTP id u1-v6mr2269986plb.254.1519918551656; Thu, 01 Mar 2018 07:35:51 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1519918551; cv=none; d=google.com; s=arc-20160816; b=tzyhwyEOev+T8TsTLvz09XQgiyx3QgARUK1zvWKDruYo/J3/ndTZ8OIS1thbzmeUzV JgCSStpJGyVPnptvWlmWNsMc6iGpIlOLgXx0PwxkNHj40jv16Ltd05AeyI8A8Lhi58ke X33Q8YavxqKn50zJ+nCfvCBaG3f8fcuhkehuFZRb6GDSGrKeHKXPYrmN65euZjJEj6CT MXngF+NMHzcHupUhNdHx7s3jkkS442f2nraQkyJ71Ryqqx5lyQxcKXpw7nstA6aRDgRo S8U0k9ORO9TlNHpZ9DSUHxecTHQSPyKcgLZPG7FeON2+eokrT+xRF58etjwnwRCPdEOL q2XA== 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=7zXjYTfZw4vQueCEEtq0ew/Ndl4vT2LtXYpjyV4Xtgo=; b=To0qIRJ+lVc0l1jWxBJUa6HFVj6GZDq88bqGiUo+5LnTTB7NfrmbJGVsgL+O6nfIl1 TXlx+QTjmGMsYYFFp8iIKlP5PW6WZv7QnG27Tg8h4ZDgTjrX0hP9eUw2jfhLCdFg03UT 0wyHplKuLVvjWpQrCs5q3QTS2Jsqv3VYbIZK0Ww9su+UvRYGcXaQgygkn3zyIwydZBp3 thJ+FCZHQiJaciXXwMZ41W3pnYM3H8Ig+c0+18HqvCFf93G6tEdqlNkM0/vD1CKsxzD5 Pka0UsargENFBUWbcpS+D8LgKze/OyFavmRuGhzyGtyxlySrFrMi2cJ805072f8ZNurW 6OpQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@microsoft.com header.s=selector1 header.b=m61P8Mue; 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 g4si3157102pfh.98.2018.03.01.07.35.51; Thu, 01 Mar 2018 07:35:51 -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=m61P8Mue; 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 S1032474AbeCAPft (ORCPT + 10 others); Thu, 1 Mar 2018 10:35:49 -0500 Received: from mail-sn1nam02on0133.outbound.protection.outlook.com ([104.47.36.133]:15072 "EHLO NAM02-SN1-obe.outbound.protection.outlook.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1032463AbeCAPfm (ORCPT ); Thu, 1 Mar 2018 10:35:42 -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=7zXjYTfZw4vQueCEEtq0ew/Ndl4vT2LtXYpjyV4Xtgo=; b=m61P8MueJl89HsHxmJILWNgRiTTkdeedlGKZ5+EoDxZacR7yHTc8WcEF84gAqeXkO2CYs0exxl4+WXnHq7T2MElclfj7bwic1yaYvsKlzM4cbh/YYOQ5j+W+hhqzplzEzJm62V5InVcaEc2IXNcVJQcB8avK0AJ42Xk69ij9ICI= Received: from DM5PR2101MB1032.namprd21.prod.outlook.com (52.132.128.13) by DM5PR2101MB0885.namprd21.prod.outlook.com (52.132.132.154) 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:35:38 +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:35:38 +0000 From: Sasha Levin To: "stable@vger.kernel.org" , "stable-commits@vger.kernel.org" CC: Nicolas Pitre , Nicolas Pitre , Bartlomiej Zolnierkiewicz , Sasha Levin Subject: [added to the 4.1 stable tree] console/dummy: leave .con_font_get set to NULL Thread-Topic: [added to the 4.1 stable tree] console/dummy: leave .con_font_get set to NULL Thread-Index: AQHTsXGr3t2TyGca90G7z6FN4i7D+A== Date: Thu, 1 Mar 2018 15:26:29 +0000 Message-ID: <20180301152116.1486-370-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; DM5PR2101MB0885; 6:ElAhrKESgWE1nldDD52nBSFdSCHdl1e+XcY6YZW8fqrsvxQlEbbow5ab3naLuI05dv0DD1uDgVyY1Xipl5YHeu0lUJZVoKLmsYlReum/YY1S/ufXsNdnyD5dLqWnFPTeB70lpRziFE/olUJF8HUZ9EQ1/kFbq1LPdl2p4pXnAT9bL8GpjLa2lp93sA/BfbKRx8lj5QDBngucCZnDgwCj1zRsW7kvmrryqcWL1wTW69BGXhZx6ovNp7Kosz86m8cMErdsZJYEXJCLdDEfZYa1mseBKAuVGE7sptJ7X3UJewg/agl4IVaFFhFyjiSY0SFWuYyF96zmk4tOE8OaZmCVPwObZtU5izhxiy6BTgRFYzx+xCKsFZBxpOrPFEdSU7Ub; 5:CXn9dPM7i4tpScsmu+JbyiRSgnXILeEughOGkuICyzY4MZ0ccnXor+nF+jg9s3+9S7Vfyi4kFb1svzMFtcLuEymKEQmun1TN6vGZc4EShFhy1edKCwFwoiQUEaPpN2veht2bzrUMgOwc9YZgE2X/z+SnXo50ni0G2q5HiBerZWo=; 24:R+KZma4ieHBpuy0wd4Vu4Z3RlFJ2F8ddKQBmSIKrFKhGs4yL46X46cM15tW/J98qK4S+VSQrI5X21EJ1xDfd5OnXdr3h45XfVJ8MrpKqSVQ=; 7:HKr3eHAyEfK/P2/LDZbZyA/3v+oI6Jzz7tjtm2Y3N6v2N240s7SRG2HYqT4RMH4EMdP+XSyYbXl/URdfU4i+IlNzt+UE6vY6h8f7T1xrccm2JUyIkig3LeH9VqYOGk5neD5VJNqgQYpJUhXW7BNifCMsDOxYoZOFC9QBHwAiKX1MekwkNBtaKmeCflZiPSE8PhEUS/WdTIQuIQULN5cDZKt57jrdZkzWgd7AvDGASrSqNk4zKHDfOcfIuMwP+lHX x-ms-office365-filtering-ht: Tenant x-ms-office365-filtering-correlation-id: 542157dc-cbc9-4d9f-d252-08d57f8a1566 x-microsoft-antispam: UriScan:; BCL:0; PCL:0; RULEID:(7020095)(4652020)(4534165)(4627221)(201703031133081)(201702281549075)(48565401081)(5600026)(4604075)(3008032)(2017052603307)(7193020); SRVR:DM5PR2101MB0885; x-ms-traffictypediagnostic: DM5PR2101MB0885: x-microsoft-antispam-prvs: x-exchange-antispam-report-test: UriScan:(28532068793085)(89211679590171)(9452136761055)(7411616537696); x-exchange-antispam-report-cfa-test: BCL:0; PCL:0; RULEID:(8211001083)(61425038)(6040501)(2401047)(8121501046)(5005006)(3231220)(944501225)(52105095)(3002001)(93006095)(93001095)(10201501046)(6055026)(61426038)(61427038)(6041288)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(20161123562045)(20161123564045)(6072148)(201708071742011); SRVR:DM5PR2101MB0885; BCL:0; PCL:0; RULEID:; SRVR:DM5PR2101MB0885; x-forefront-prvs: 05986C03E0 x-forefront-antispam-report: SFV:NSPM; SFS:(10019020)(366004)(346002)(396003)(376002)(39860400002)(39380400002)(199004)(189003)(26005)(316002)(107886003)(1076002)(478600001)(54906003)(105586002)(8676002)(110136005)(53936002)(2950100002)(2906002)(6666003)(5660300001)(10290500003)(575784001)(86362001)(3280700002)(10090500001)(97736004)(3660700001)(14454004)(59450400001)(4326008)(6512007)(3846002)(6486002)(106356001)(36756003)(6116002)(66066001)(6506007)(5250100002)(99286004)(6436002)(2501003)(305945005)(6346003)(76176011)(25786009)(102836004)(68736007)(22452003)(2900100001)(186003)(7736002)(86612001)(72206003)(81156014)(8936002)(81166006)(22906009)(142923001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM5PR2101MB0885; H:DM5PR2101MB1032.namprd21.prod.outlook.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX: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: dJwk6bXXnSlVgt63wkrT4Ffl2vfGNvmYMg80GiWUyM2TruFzmP3Or6bvZpYD4oEvxi4R5zvlW0wPwsr/JdImlbBz2JU1Hxk/ZvGwebgzWtupfMp8caJ3mL+sdw2LHy2hbLQsze5KfJvCkz082BhGzXiLdENbLGQJNrHu2S/Y4Yw= spamdiagnosticoutput: 1:99 spamdiagnosticmetadata: NSPM MIME-Version: 1.0 X-OriginatorOrg: microsoft.com X-MS-Exchange-CrossTenant-Network-Message-Id: 542157dc-cbc9-4d9f-d252-08d57f8a1566 X-MS-Exchange-CrossTenant-originalarrivaltime: 01 Mar 2018 15:26:29.9507 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 72f988bf-86f1-41af-91ab-2d7cd011db47 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR2101MB0885 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org From: Nicolas Pitre 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 724ba8b30b044aa0d94b1cd374fc15806cdd6f18 ] When this method is set, the caller expects struct console_font fields to be properly initialized when it returns. Leave it unset otherwise nonsensical (leaked kernel stack) values are returned to user space. Signed-off-by: Nicolas Pitre Cc: stable@vger.kernel.org Signed-off-by: Bartlomiej Zolnierkiewicz Signed-off-by: Sasha Levin --- drivers/video/console/dummycon.c | 1 - 1 file changed, 1 deletion(-) diff --git a/drivers/video/console/dummycon.c b/drivers/video/console/dummycon.c index 0efc52f11ad0..b30e7d87804b 100644 --- a/drivers/video/console/dummycon.c +++ b/drivers/video/console/dummycon.c @@ -68,7 +68,6 @@ const struct consw dummy_con = { .con_switch = DUMMY, .con_blank = DUMMY, .con_font_set = DUMMY, - .con_font_get = DUMMY, .con_font_default = DUMMY, .con_font_copy = DUMMY, .con_set_palette = DUMMY,