From patchwork Wed Dec 11 15:04:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg Kroah-Hartman X-Patchwork-Id: 181223 Delivered-To: patch@linaro.org Received: by 2002:a92:3001:0:0:0:0:0 with SMTP id x1csp657946ile; Wed, 11 Dec 2019 07:08:48 -0800 (PST) X-Google-Smtp-Source: APXvYqyKL0E6n//+uzNurkCOyMikGcLWbI9c1yQWpQH6yNFeW1kRitIJZcNIPQAkZvi6ibij46nn X-Received: by 2002:a05:6830:1ed0:: with SMTP id c16mr2524015otj.21.1576076928851; Wed, 11 Dec 2019 07:08:48 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576076928; cv=none; d=google.com; s=arc-20160816; b=t/FGaHCss2V/7J55iurA+QOSg2V7YFLQjXfyo1bhbrEYSxHTmHFyhbgJI7fQotB2TE kA3fP4YTE029Y8piXqm/cUjMex3lC6snKlFU+QjD9D7quiqSHCtD4tSt8cgcXkrQxzdg A6f3Ib4a5cg+2kvP67wfERUvoTF1uzf/L2343sh5zMZQU69lNAGNXb52rTrvHJ1unfJB xR8TwjVjQeWXS2gQ99gR88Ix1rLqW43X/WuEwGyVjjwgCYLBLMyXhxHfunnSHdLOjzT3 T/oUPMR9um4zw52ngJDmLIJh068LjhtpxTp91sxSeFuoMjBGz1m5fBRhCgi4KlE1ZPoI e9MA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=ahFPof/eP5/Mbydk7UDpCMp1ABtv2fEMHVgLmyBl6KI=; b=cQmi6PewAI+NTkhRZNmaLiAuRBfESIAikKESoi+LwIcOlqnGPKOASbmV8QyZBX6sSL xXJo4NjbtO6RsUyYkB+jpAcBPebMXix6Wl8p6+1ngJteSPCidkkFOJjapzpVghc7zG7p Jf2uainOLo2Ki7uWpBlDqNNUvkdpcAiRtDjJV4AC0yvGdu32K4eLEtMPEtsSNUA8Gts/ 4oG4I4CntUs/V+XpoJb92VQpchfObHFzlVUd/tZQNWGW68P9kAozQCKehUhBoYsctQVK SYmBV7af19KkIgfqqOaFfjRWIq5jy2QLeJ/797vVuZUfBuE6lNJg+R4manvb4/mXYuA3 xvrQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="tG9/eKBj"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id c1si1474783oto.91.2019.12.11.07.08.48; Wed, 11 Dec 2019 07:08:48 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=@kernel.org header.s=default header.b="tG9/eKBj"; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730453AbfLKPIr (ORCPT + 27 others); Wed, 11 Dec 2019 10:08:47 -0500 Received: from mail.kernel.org ([198.145.29.99]:56440 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729746AbfLKPIo (ORCPT ); Wed, 11 Dec 2019 10:08:44 -0500 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 981AD2173E; Wed, 11 Dec 2019 15:08:43 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576076924; bh=cRi5G9C0XWPPCnV+02MMDB3bXkRsVGf0Rh3K1z24W0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=tG9/eKBj6q7FojlEGo8U1gZxjhoEtjErd8oJv9GsWL+3Gf6QtTiMyPvBzeCfpVd7t 5/xUolbovOx849FDi/XIuDb0zngmiI2J97yB2wNo4SKUQb0OcwCCj3W0skAwcDfFGS 3dPo9b9pljo4ghV/XOd54nvLldqHDWz4dYVP67jU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 5.4 06/92] lp: fix sparc64 LPSETTIMEOUT ioctl Date: Wed, 11 Dec 2019 16:04:57 +0100 Message-Id: <20191211150223.378611864@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150221.977775294@linuxfoundation.org> References: <20191211150221.977775294@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Arnd Bergmann commit 45a2d64696b11913bcf1087b041740edbade3e21 upstream. The layout of struct timeval is different on sparc64 from anything else, and the patch I did long ago failed to take this into account. Change it now to handle sparc64 user space correctly again. Quite likely nobody cares about parallel ports on sparc64, but there is no reason not to fix it. Cc: stable@vger.kernel.org Fixes: 9a450484089d ("lp: support 64-bit time_t user space") Signed-off-by: Arnd Bergmann Link: https://lore.kernel.org/r/20191108203435.112759-7-arnd@arndb.de Signed-off-by: Greg Kroah-Hartman --- drivers/char/lp.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/drivers/char/lp.c +++ b/drivers/char/lp.c @@ -713,6 +713,10 @@ static int lp_set_timeout64(unsigned int if (copy_from_user(karg, arg, sizeof(karg))) return -EFAULT; + /* sparc64 suseconds_t is 32-bit only */ + if (IS_ENABLED(CONFIG_SPARC64) && !in_compat_syscall()) + karg[1] >>= 32; + return lp_set_timeout(minor, karg[0], karg[1]); }