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.1 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=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 71E4AC4360F for ; Mon, 18 Feb 2019 14:00:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 4027A217D9 for ; Mon, 18 Feb 2019 14:00:46 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550498446; bh=mkDKXb2pwIW1//BuwtkqoGIh/gxvL7m6j4esyClPYrM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=vcyq2FVseDpRZsAKVK/fsC5M1mxtupgJk2Qv3kBI3iRpzYnf4d4JwBoWh2icS09CH IBfk5N6CoR3GOgG9cWHyAlPq8WvbOLCyaEkmQch+qGjdqGZy/K5KgLiVAuKc0gaUEo hfBKAGAPOoOmWaaNKaoKm9GntWgRb2+4KjuDtj1s= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2388895AbfBROAo (ORCPT ); Mon, 18 Feb 2019 09:00:44 -0500 Received: from mail.kernel.org ([198.145.29.99]:41950 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2388303AbfBROAl (ORCPT ); Mon, 18 Feb 2019 09:00:41 -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 62D7120842; Mon, 18 Feb 2019 14:00:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1550498440; bh=mkDKXb2pwIW1//BuwtkqoGIh/gxvL7m6j4esyClPYrM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=mlGKZ0H5J8dNMi5bogMoJxoVeB83a7W5pRIKMumlOCJMoRQ59jFm1GUf8hLuPHlLJ fuzimq+zNqxUJuYW+TBqsLTP1s9mYQGydIcgRRF3VFW2xijkQ2TZ4cCOvknlGykVEe bnzmTuGWUf3Fbt5NCrZIsW/8rW42QxUeCoh62lZg= 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.4 010/143] ptp: check gettime64 return code in PTP_SYS_OFFSET ioctl Date: Mon, 18 Feb 2019 14:42:18 +0100 Message-Id: <20190218133529.537709028@linuxfoundation.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190218133529.099444112@linuxfoundation.org> References: <20190218133529.099444112@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: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org 4.4-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 4eb254a273f8..4861cfddcdd3 100644 --- a/drivers/ptp/ptp_chardev.c +++ b/drivers/ptp/ptp_chardev.c @@ -204,7 +204,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++; @@ -257,6 +259,7 @@ long ptp_ioctl(struct posix_clock *pc, unsigned int cmd, unsigned long arg) break; } +out: kfree(sysoff); return err; } -- 2.19.1