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,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_PASS,URIBL_BLOCKED,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 9E47CC282CE for ; Mon, 22 Apr 2019 19:52:40 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 6F480204EC for ; Mon, 22 Apr 2019 19:52:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962760; bh=wOE5ZcJdp3Nl4hStbVWmI+2I8nUcvwRioQP/iZMcOAc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=fInMJwJK3id1/BfzcAI7B7oIcn04YPPtDZA/aSqQhEkVOfAe8g3p34eegMORHBMCF k5upVcZvLwyRPaDQOtyO9Uws6ldwumuiDsxviS6PZw9EluWMZ28WUbmS3zJJ2gAXtV rgxgZDYCVvXjtSkEWmswuxbz9N0lV4j4JLwZASSM= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731328AbfDVTwi (ORCPT ); Mon, 22 Apr 2019 15:52:38 -0400 Received: from mail.kernel.org ([198.145.29.99]:54148 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731013AbfDVTuQ (ORCPT ); Mon, 22 Apr 2019 15:50:16 -0400 Received: from sasha-vm.mshome.net (c-73-47-72-35.hsd1.nh.comcast.net [73.47.72.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 3BA14218D3; Mon, 22 Apr 2019 19:50:15 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1555962615; bh=wOE5ZcJdp3Nl4hStbVWmI+2I8nUcvwRioQP/iZMcOAc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=taDRIJ+LOO49iswDPFAK2UHtjV5r/Slkriw1wLdQ1pUh2T5vmRkqPjMfGPfvCPTGh iLE1CEBR9Tz6wEbeqA+hk7XPm+WqoUgwnvVf2r5w6ZvjgyKJn8uJsc/ni5q0e0UBOa ct46hn53pBUeTGMKnnpbJnY/N8H/DWtLerxMKmDA= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Fabien Dessenne , Greg Kroah-Hartman , Sasha Levin Subject: [PATCH AUTOSEL 4.4 17/21] tty: fix NULL pointer issue when tty_port ops is not set Date: Mon, 22 Apr 2019 15:49:37 -0400 Message-Id: <20190422194941.13433-17-sashal@kernel.org> X-Mailer: git-send-email 2.19.1 In-Reply-To: <20190422194941.13433-1-sashal@kernel.org> References: <20190422194941.13433-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: Fabien Dessenne [ Upstream commit f4e68d58cf2b20a581759bbc7228052534652673 ] Unlike 'client_ops' which is initialized to 'default_client_ops', the port operations 'ops' may be left to NULL. Check the 'ops' value before checking the 'ops->x' value. Signed-off-by: Fabien Dessenne Signed-off-by: Greg Kroah-Hartman Signed-off-by: Sasha Levin (Microsoft) --- drivers/tty/tty_port.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/drivers/tty/tty_port.c b/drivers/tty/tty_port.c index 482f33f20043..3f0ef1a4f558 100644 --- a/drivers/tty/tty_port.c +++ b/drivers/tty/tty_port.c @@ -212,7 +212,7 @@ static void tty_port_shutdown(struct tty_port *port, struct tty_struct *tty) if (tty && C_HUPCL(tty)) tty_port_lower_dtr_rts(port); - if (port->ops->shutdown) + if (port->ops && port->ops->shutdown) port->ops->shutdown(port); } out: @@ -292,7 +292,7 @@ EXPORT_SYMBOL_GPL(tty_port_tty_wakeup); int tty_port_carrier_raised(struct tty_port *port) { - if (port->ops->carrier_raised == NULL) + if (!port->ops || !port->ops->carrier_raised) return 1; return port->ops->carrier_raised(port); } @@ -309,7 +309,7 @@ EXPORT_SYMBOL(tty_port_carrier_raised); void tty_port_raise_dtr_rts(struct tty_port *port) { - if (port->ops->dtr_rts) + if (port->ops && port->ops->dtr_rts) port->ops->dtr_rts(port, 1); } EXPORT_SYMBOL(tty_port_raise_dtr_rts); @@ -325,7 +325,7 @@ EXPORT_SYMBOL(tty_port_raise_dtr_rts); void tty_port_lower_dtr_rts(struct tty_port *port) { - if (port->ops->dtr_rts) + if (port->ops && port->ops->dtr_rts) port->ops->dtr_rts(port, 0); } EXPORT_SYMBOL(tty_port_lower_dtr_rts); @@ -584,7 +584,7 @@ int tty_port_open(struct tty_port *port, struct tty_struct *tty, if (!test_bit(ASYNCB_INITIALIZED, &port->flags)) { clear_bit(TTY_IO_ERROR, &tty->flags); - if (port->ops->activate) { + if (port->ops && port->ops->activate) { int retval = port->ops->activate(port, tty); if (retval) { mutex_unlock(&port->mutex); -- 2.19.1