From patchwork Wed Dec 11 15:04:54 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: 181229 Delivered-To: patch@linaro.org Received: by 2002:ac9:44c4:0:0:0:0:0 with SMTP id t4csp902093och; Wed, 11 Dec 2019 07:11:32 -0800 (PST) X-Google-Smtp-Source: APXvYqzptu3cPm1hjs8YZKZggX3plUKNtRfXJpq6R6eFryGAvjg9ZDqa/J8A0j/qBkYuAPmk9fuc X-Received: by 2002:a54:4117:: with SMTP id l23mr2991503oic.140.1576077092730; Wed, 11 Dec 2019 07:11:32 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1576077092; cv=none; d=google.com; s=arc-20160816; b=JJsK8UNnODrsSXAGd9sYtR1w5SdQsIuuLfSD41Qh/vZiJ+KvH8sUQF8m0heo4mP1zx bZ0Wa6V0ZdkcEHrU/nNtaTcc7VLmanFb4hPMTbsXrJLqU+kiyRzHv++ImMkZ6yvyfIW0 Qq3ribnDbECReHsTNeGm18wFBbIWIq1ksqLYY+/a/evasZhUZhcnfj2A8cU64EwQbAFf dBBJjWukCU3vKaDzebWfzB9/2dyySp898M06NHUFPPxyswmYRvbrOsQ7fRiAYryLxk2+ dHkqJDY/CPz0ILwbPP3+cV0QlhFNG94hhZOsu6MHfKbTRrGyLxrQx+VZAaGEgY7yEjyj 9zoA== 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=clj2u8mMOk6ahytwySWYIDZCyCtReo6Pv+A/c4NxmzQFYZoy2Saj7lPEAHwXr9oTSN ag31sZ/euedvrmvvOkcfrQ88R6/uLMMA2Qf0uWSbtkYKj6UP6v8qsKLwMI7TQ9cpuh2S Zj834sv07hc2mMJblQnYLuFD+Q1RDOoo688FjMigavA7fkzOAEOX65sG7/TV72NBuaV7 tvaLCizWcLijYYzvUEOcOzhWsL7fWjtvEWaPm2z3NhqKMX9Nh+VqFmIUWzzEPRq9VWHV RIuHBjJBmYRJZ8V7qTcysAfX5sV1QumFJs5DOoVxf0MwYcjNYqoyrRoXEL3kfHccXFpf anvw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=sBwBWzoH; 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 Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id f187si1347270oia.218.2019.12.11.07.11.32; Wed, 11 Dec 2019 07:11:32 -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=@kernel.org header.s=default header.b=sBwBWzoH; 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 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730942AbfLKPLb (ORCPT + 14 others); Wed, 11 Dec 2019 10:11:31 -0500 Received: from mail.kernel.org ([198.145.29.99]:60100 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730938AbfLKPLa (ORCPT ); Wed, 11 Dec 2019 10:11:30 -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 4DB38222C4; Wed, 11 Dec 2019 15:11:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1576077089; bh=cRi5G9C0XWPPCnV+02MMDB3bXkRsVGf0Rh3K1z24W0U=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=sBwBWzoH9HnRyItramGwexQoNaqYoeDO+57KUGWDv6Tae04H4g5QOBYm5aZaciATB +tefbQRKspJVbAB2arhrsB3z2tTNnB8LlEEnTmZTtoD7Na/o+2zjW0grl/uY9fsBCZ 2XKAGWMLnRHet6uUC5p71EDxzUt8RJMkbL0sSQCo= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Arnd Bergmann Subject: [PATCH 5.3 005/105] lp: fix sparc64 LPSETTIMEOUT ioctl Date: Wed, 11 Dec 2019 16:04:54 +0100 Message-Id: <20191211150222.701178959@linuxfoundation.org> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20191211150221.153659747@linuxfoundation.org> References: <20191211150221.153659747@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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]); }