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,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 770B0C76191 for ; Mon, 15 Jul 2019 14:05:18 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4C2002086C for ; Mon, 15 Jul 2019 14:05:18 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563199518; bh=+IJT9rcKJXvihHeLk9LU5Vs73d9NTD4PUXQVZ9ablkU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=yHAMcn54QP1qcGSEid9FRmRT8bhMPK+mLPZ8GOyskwh8sJ0cOPn2KAH0qXVLqJwTO eSVuTMjsag1YmzYWvlQldQw9TfSszKy6YSHLLIwaeJ0NT5KgDSbapnfXTjaO+IKmIb bO+pPK3D4WzwQL+fCiCLvb1Edi1yyMz5zVeyhi8k= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1732519AbfGOOFQ (ORCPT ); Mon, 15 Jul 2019 10:05:16 -0400 Received: from mail.kernel.org ([198.145.29.99]:51278 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388084AbfGOOFG (ORCPT ); Mon, 15 Jul 2019 10:05:06 -0400 Received: from sasha-vm.mshome.net (unknown [73.61.17.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 07DDD2086C; Mon, 15 Jul 2019 14:05:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1563199505; bh=+IJT9rcKJXvihHeLk9LU5Vs73d9NTD4PUXQVZ9ablkU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=ADQE+DfWn6fWRHn9HUQYdkfMctlLu1j84HLyT/buKPf39wCLdZ/kY9Hg0OZHrm6Sa ZNhRXcrhCvI0w/sI6WDb2oV1yOUMokgW/B+ha/UICNC62urNAYPZAMyH/qzXfEyemd QjIw36HiF53Zj349D0pSNi0E2L0JUeEF1vU+In54= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Jungo Lin , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 5.1 025/219] media: media_device_enum_links32: clean a reserved field Date: Mon, 15 Jul 2019 10:00:26 -0400 Message-Id: <20190715140341.6443-25-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190715140341.6443-1-sashal@kernel.org> References: <20190715140341.6443-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: Jungo Lin [ 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 b8ec88612df7..6893843edada 100644 --- a/drivers/media/media-device.c +++ b/drivers/media/media-device.c @@ -502,6 +502,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)); @@ -513,7 +514,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