From patchwork Mon Aug 10 15:21:24 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 266639 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=-13.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH, MAILING_LIST_MULTI, SIGNED_OFF_BY, SPF_HELO_NONE, SPF_PASS, URIBL_BLOCKED, 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 897B7C433E0 for ; Mon, 10 Aug 2020 15:36:19 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 69BF522CAE for ; Mon, 10 Aug 2020 15:36:19 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597073779; bh=gQWng/bO5oR+BA08SNco2VcnZgToS77LbevgmS+C7z4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=hFJqtDM774i9LF5EGylFA4bpXeMKKTyZ55Hspeaih0DsqCU4GpBeko8SG2pnJzRnp eUwcfs95iSRo+ghBV9Xojag/0Jald4hkrDeLvaHxymlcECCAdZT6EuXdFxbn6FFZ3p Fkr1ff+MBUcf5OWNjOm7jKkHZHbYGknH2XsmlWRc= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1728481AbgHJPgP (ORCPT ); Mon, 10 Aug 2020 11:36:15 -0400 Received: from mail.kernel.org ([198.145.29.99]:33290 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1728745AbgHJP1Y (ORCPT ); Mon, 10 Aug 2020 11:27:24 -0400 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 4612222CF7; Mon, 10 Aug 2020 15:27:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1597073243; bh=gQWng/bO5oR+BA08SNco2VcnZgToS77LbevgmS+C7z4=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iJ3NFIqZlN9oNRRv4uQj2NqS0Pi2hF5USVikDk2Yk4yL9BzRsCZ2uhaMG8fDIbl5t UVuBTLHsdhmFEY6Af62rcRwa4ovY8m6b7lud84qJhdQntR87GeIcZM1ZCLkizvOCCz LRxSn5HSVwIeO+tpArPDSaE1Smrx0fBs+PnRKNAU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Wolfram Sang , Alain Volmat , Wolfram Sang , Sasha Levin Subject: [PATCH 5.4 37/67] i2c: slave: add sanity check when unregistering Date: Mon, 10 Aug 2020 17:21:24 +0200 Message-Id: <20200810151811.269933247@linuxfoundation.org> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20200810151809.438685785@linuxfoundation.org> References: <20200810151809.438685785@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: Wolfram Sang [ Upstream commit 8808981baf96e1b3dea1f08461e4d958aa0dbde1 ] Signed-off-by: Wolfram Sang Reviewed-by: Alain Volmat Signed-off-by: Wolfram Sang Signed-off-by: Sasha Levin --- drivers/i2c/i2c-core-slave.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/drivers/i2c/i2c-core-slave.c b/drivers/i2c/i2c-core-slave.c index 549751347e6c7..1589179d5eb92 100644 --- a/drivers/i2c/i2c-core-slave.c +++ b/drivers/i2c/i2c-core-slave.c @@ -58,6 +58,9 @@ int i2c_slave_unregister(struct i2c_client *client) { int ret; + if (IS_ERR_OR_NULL(client)) + return -EINVAL; + if (!client->adapter->algo->unreg_slave) { dev_err(&client->dev, "%s: not supported by adapter\n", __func__); return -EOPNOTSUPP;