From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-10.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 008E7C7618B for ; Fri, 26 Jul 2019 13:45:20 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id CCFDC22CEB for ; Fri, 26 Jul 2019 13:45:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564148719; bh=cljafivhS5SgwGmwbvwM7kjh7jlUt6mW6AydIjbkjVo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=ZS5EZQOYAc0ZrroYrpbCSGzMH22dG6O0/2bkyWxdPm5YELF8GS0tlRblW7AFngJqT XIR7h+N7lZh5Fzs65k877afQGnq4Lo/vVKdvumpoy/BtX/wn+Sx6VdcvhPrhBob0mm 5LuV/NnmUFeUdoBBqwab6Cph8kNUcMBG8M5If86U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388529AbfGZNpS (ORCPT ); Fri, 26 Jul 2019 09:45:18 -0400 Received: from mail.kernel.org ([198.145.29.99]:53990 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728143AbfGZNpM (ORCPT ); Fri, 26 Jul 2019 09:45:12 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.35]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id AEA7922CE9; Fri, 26 Jul 2019 13:45:10 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564148711; bh=cljafivhS5SgwGmwbvwM7kjh7jlUt6mW6AydIjbkjVo=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Vf8GA85BVfYGM/4r/wlVn1CJUcPwOUoyEpnaEL5paQKmvdcn/Ug+bKiocMV5YAl6b C3V555TORvqXmu/zo2Yw1gUaeUu7+Cy4WM8jSFJBM7DD8JQ+8FBbEsk4rNPpjs27BA jWPHjnO+dtzfqsyQsk+MCHgDEHUPBqU4+ydOSby8= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Miroslav Lichvar , Thomas Gleixner , Rodolfo Giometti , Greg KH , Dan Carpenter , Andrew Morton , Linus Torvalds , Sasha Levin Subject: [PATCH AUTOSEL 4.9 24/30] drivers/pps/pps.c: clear offset flags in PPS_SETPARAMS ioctl Date: Fri, 26 Jul 2019 09:44:26 -0400 Message-Id: <20190726134432.12993-24-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190726134432.12993-1-sashal@kernel.org> References: <20190726134432.12993-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Miroslav Lichvar [ Upstream commit 5515e9a6273b8c02034466bcbd717ac9f53dab99 ] The PPS assert/clear offset corrections are set by the PPS_SETPARAMS ioctl in the pps_ktime structs, which also contain flags. The flags are not initialized by applications (using the timepps.h header) and they are not used by the kernel for anything except returning them back in the PPS_GETPARAMS ioctl. Set the flags to zero to make it clear they are unused and avoid leaking uninitialized data of the PPS_SETPARAMS caller to other applications that have a read access to the PPS device. Link: http://lkml.kernel.org/r/20190702092251.24303-1-mlichvar@redhat.com Signed-off-by: Miroslav Lichvar Reviewed-by: Thomas Gleixner Acked-by: Rodolfo Giometti Cc: Greg KH Cc: Dan Carpenter Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Sasha Levin --- drivers/pps/pps.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/drivers/pps/pps.c b/drivers/pps/pps.c index 2f07cd615665..76ae38450aea 100644 --- a/drivers/pps/pps.c +++ b/drivers/pps/pps.c @@ -129,6 +129,14 @@ static long pps_cdev_ioctl(struct file *file, pps->params.mode |= PPS_CANWAIT; pps->params.api_version = PPS_API_VERS; + /* + * Clear unused fields of pps_kparams to avoid leaking + * uninitialized data of the PPS_SETPARAMS caller via + * PPS_GETPARAMS + */ + pps->params.assert_off_tu.flags = 0; + pps->params.clear_off_tu.flags = 0; + spin_unlock_irq(&pps->lock); break; -- 2.20.1