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=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,URIBL_BLOCKED,USER_AGENT_GIT autolearn=unavailable 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 2B8B5C7618E for ; Mon, 29 Jul 2019 20:16:16 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id E6EEE205F4 for ; Mon, 29 Jul 2019 20:16:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564431376; bh=yg1hvWRvBLsQ6BTuRLMggs3+Q2JAiZAU0MAvu5x9OSc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=AzRdrEwsPmLIjORchgfgJXscXCYpU+ecENdEfDwdDDmL6YahZBhc5iBfGQ06WUM6d LagNrV1XaTTuz8A8mFzdVqF/rzDONGRcpVoIiknPXPEvVDq/YHAcjLwyWy2DZdTrdP CEDU5AgaVUuTe/rg6hJZ+RtGxaohaNlbv9K32Nqs= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1729533AbfG2TYg (ORCPT ); Mon, 29 Jul 2019 15:24:36 -0400 Received: from mail.kernel.org ([198.145.29.99]:36846 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729525AbfG2TYg (ORCPT ); Mon, 29 Jul 2019 15:24:36 -0400 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 39B70217D6; Mon, 29 Jul 2019 19:24:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1564428275; bh=yg1hvWRvBLsQ6BTuRLMggs3+Q2JAiZAU0MAvu5x9OSc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=YX8edpk7kt7ez1305ix7+LFbD3xNZVpFHhg+e5ZLejsISF2hDOyGRq8WwvCb/Yl6Z 4Z2HRKKMw6qTTUr1T2B6j2gLhe2CWod+Ww/agDVpwLo4/h242oW1CbTNRShwBXdO5J KAYrTD0AXW2crCNcx3Jw4cCI2ZjbfqK1m6KrbakA= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Jungo Lin , Mauro Carvalho Chehab , Sasha Levin Subject: [PATCH 4.14 017/293] media: media_device_enum_links32: clean a reserved field Date: Mon, 29 Jul 2019 21:18:28 +0200 Message-Id: <20190729190821.875100068@linuxfoundation.org> X-Mailer: git-send-email 2.22.0 In-Reply-To: <20190729190820.321094988@linuxfoundation.org> References: <20190729190820.321094988@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@vger.kernel.org [ Upstream commit f49308878d7202e07d8761238e01bd0e5fce2750 ] In v4l2-compliance utility, test MEDIA_IOC_ENUM_ENTITIES will check whether reserved field of media_links_enum filled with zero. However, for 32 bit program, the reserved field is missing copy from kernel space to user space in media_device_enum_links32 function. This patch adds the cleaning a reserved field logic in media_device_enum_links32 function. Signed-off-by: Jungo Lin Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/media-device.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/drivers/media/media-device.c b/drivers/media/media-device.c index 62b2c5d9bdfb..a6d56154fac7 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -470,6 +470,7 @@ static long media_device_enum_links32(struct media_device *mdev, { struct media_links_enum links; compat_uptr_t pads_ptr, links_ptr; + int ret; memset(&links, 0, sizeof(links)); @@ -481,7 +482,13 @@ static long media_device_enum_links32(struct media_device *mdev, links.pads = compat_ptr(pads_ptr); links.links = compat_ptr(links_ptr); - return media_device_enum_links(mdev, &links); + ret = media_device_enum_links(mdev, &links); + if (ret) + return ret; + + memset(ulinks->reserved, 0, sizeof(ulinks->reserved)); + + return 0; } #define MEDIA_IOC_ENUM_LINKS32 _IOWR('|', 0x02, struct media_links_enum32) -- 2.20.1