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.0 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_PASS,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 418A5C169C4 for ; Mon, 11 Feb 2019 15:18:12 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 0EF62222B0 for ; Mon, 11 Feb 2019 15:18:12 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549898292; bh=R3MwcrJHljIJhxdEUonxbDlLAxb82FtSrBlutXzQ91M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=XLrbypteUMWhi6o9B2JI2S7ciSTxSPYUWSESMWR0iGxx2i3FY5wJsxQVMZh+Af3M3 89iabk4j6UJ+6DooxGUISZR5f8su2gXZXr7oAXL0m3vEC0emJasiNdmOWfEEZUGNHl pV/rr+VzMEF6eIGbhPtSvawAUceFuzr07rQ6n11U= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2391427AbfBKPRx (ORCPT ); Mon, 11 Feb 2019 10:17:53 -0500 Received: from mail.kernel.org ([198.145.29.99]:54938 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2391036AbfBKPFg (ORCPT ); Mon, 11 Feb 2019 10:05:36 -0500 Received: from localhost (5356596B.cm-6-7b.dynamic.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 D692D222B0; Mon, 11 Feb 2019 15:05:35 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1549897536; bh=R3MwcrJHljIJhxdEUonxbDlLAxb82FtSrBlutXzQ91M=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Wi9FBl0zdnOiERgtEqRusX/SwpOaGzOtLfeZ7aAWTBn5O222UP/a1eruQLbGoetuX layAWYf4hZesPqgb/KJDyRE+KwzBtiYuF41Msx1DywkOndsHDqjqapOvegj3NTp9gX Ma2PAey9DNDEDE9tsMcad75sPl4OOaQApKwIQXGM= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Richard Cochran , Jacob Keller , Miroslav Lichvar , "David S. Miller" , Sasha Levin Subject: [PATCH 4.9 013/137] ptp: check gettime64 return code in PTP_SYS_OFFSET ioctl Date: Mon, 11 Feb 2019 15:18:14 +0100 Message-Id: <20190211141813.221037593@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190211141811.964925535@linuxfoundation.org> References: <20190211141811.964925535@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review X-Patchwork-Hint: ignore 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 4.9-stable review patch. If anyone has any objections, please let me know. ------------------ [ Upstream commit 83d0bdc7390b890905634186baaa294475cd6a06 ] If a gettime64 call fails, return the error and avoid copying data back to user. Cc: Richard Cochran Cc: Jacob Keller Signed-off-by: Miroslav Lichvar Signed-off-by: David S. Miller Signed-off-by: Sasha Levin --- drivers/ptp/ptp_chardev.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/ptp/ptp_chardev.c b/drivers/ptp/ptp_chardev.c index a421d6c551b6..ecb41eacd74b 100644 --- a/drivers/ptp/ptp_chardev.c +++ b/drivers/ptp/ptp_chardev.c @@ -228,7 +228,9 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) pct->sec = ts.tv_sec; pct->nsec = ts.tv_nsec; pct++; - ptp->info->gettime64(ptp->info, &ts); + err = ptp->info->gettime64(ptp->info, &ts); + if (err) + goto out; pct->sec = ts.tv_sec; pct->nsec = ts.tv_nsec; pct++; @@ -281,6 +283,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) break; } +out: kfree(sysoff); return err; } -- 2.19.1