Received: by 2002:a25:b323:0:0:0:0:0 with SMTP id l35csp3118800ybj; Mon, 23 Sep 2019 15:11:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqxDpIApGrdFj8fZV1FbdfaqCrLadVQ9AS9/89Ndd1rD17S0bkF59cvctBnV4Xn/KbFDNPRs X-Received: by 2002:a17:906:b316:: with SMTP id n22mr1803199ejz.54.1569276714784; Mon, 23 Sep 2019 15:11:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1569276714; cv=none; d=google.com; s=arc-20160816; b=AGw4qDBTrY0xs5HcDhB9IW6ssCcGDQkFOcaw0zUzObb0HrXgxWK/Ah8knH3O5GUrQQ yP2ZwW2A6L1rU1mPRg/5+qm09mqO1bBpdVGORTrFnazwmzW/fMfb1dUIGY02VaFIImFL BIblf6kxH0ee89YDbVk2Ll0CRxw0HXHefG6Cv4orbKjhdmvY9/6mU9NNiida6JmlcMJ4 6zV7MyT1eok62f1niastpiouldUQ9xVhnGnHzGeYReG7AghLpbLIZVsySWGQtseGAE9E HDe84tv2H2rlKBBlrPXst6c4WQANRnVxWIlFsdCCjr/9wi4i+S1/nLz/6yGK1Yr286Vg CNKQ== 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 :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=dDHCiyKQMfiazIKdJF4inMear6RNePKx5ew7Fm0LLvs=; b=MKaCmjvF6FJaQRWD/4ijGUYRiOufAL4Lm7JEGwVbaKV/wC+zQrbnJHdnTkhTLGg4zY 3OjSh6h6E8QaP5VUjVoJqIfJgvfni/KNktgawtP8ELFD6wCuPZ7jwsvI2FdHpA5MYclV SGamAbVa/XVXhMD2rcT0YpEuAn78qZRw+PrOGFEJGI0bU04+iZ+C5zW+eDkqD6u1aJij qYECHZ5GffmLUgo1FAekJnDjrTUS1Xsr7/p9Lx46TkkRzD1vZ625w0pnjJrcyIvkYpfA 9GGd22VzfzjS94Q1yeGVqaEuPNI6IGv6P9VaXnlXsoeT2om4Me7vRGmt/jvxcoofuefX +LVA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=iCv0aNI6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id h12si7459759edq.437.2019.09.23.15.11.30; Mon, 23 Sep 2019 15:11:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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=iCv0aNI6; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2390910AbfIVSr3 (ORCPT + 99 others); Sun, 22 Sep 2019 14:47:29 -0400 Received: from mail.kernel.org ([198.145.29.99]:43824 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2390789AbfIVSrY (ORCPT ); Sun, 22 Sep 2019 14:47:24 -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 1DDBD206C2; Sun, 22 Sep 2019 18:47:23 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1569178043; bh=d6AmPNfDAj8KGd/fgbph9jyrUnZ5/VpvIL6yT6NRvUs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=iCv0aNI6m1T3PPTkxuodTGMuEW7LGFeItc82VeeDWPVyVY6P5ygGEnVFa+xOH88LP nD9O0yWe2ueEsCDdE7DCWAYytce7vlricyAC1IT7KBXmKLF1+7jmKa6IrH0oDi5Us4 9Yo8PytjMaIxVCX5naHMl0VRk17o5fP1fOUXQrAo= From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Hans Verkuil , Mauro Carvalho Chehab , Sasha Levin , linux-media@vger.kernel.org Subject: [PATCH AUTOSEL 5.3 123/203] media: cec-notifier: clear cec_adap in cec_notifier_unregister Date: Sun, 22 Sep 2019 14:42:29 -0400 Message-Id: <20190922184350.30563-123-sashal@kernel.org> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20190922184350.30563-1-sashal@kernel.org> References: <20190922184350.30563-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: Hans Verkuil [ Upstream commit 14d5511691e5290103bc480998bc322e68f139d4 ] If cec_notifier_cec_adap_unregister() is called before cec_unregister_adapter() then everything is OK (and this is the case today). But if it is the other way around, then cec_notifier_unregister() is called first, and that doesn't set n->cec_adap to NULL. So if e.g. cec_notifier_set_phys_addr() is called after cec_notifier_unregister() but before cec_unregister_adapter() then n->cec_adap points to an unregistered and likely deleted cec adapter. So just set n->cec_adap->notifier and n->cec_adap to NULL for rubustness. Eventually cec_notifier_unregister will disappear and this will be simplified substantially. Signed-off-by: Hans Verkuil Signed-off-by: Mauro Carvalho Chehab Signed-off-by: Sasha Levin --- drivers/media/cec/cec-notifier.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/drivers/media/cec/cec-notifier.c b/drivers/media/cec/cec-notifier.c index 52a867bde15fd..4d82a5522072e 100644 --- a/drivers/media/cec/cec-notifier.c +++ b/drivers/media/cec/cec-notifier.c @@ -218,6 +218,8 @@ void cec_notifier_unregister(struct cec_notifier *n) mutex_lock(&n->lock); n->callback = NULL; + n->cec_adap->notifier = NULL; + n->cec_adap = NULL; mutex_unlock(&n->lock); cec_notifier_put(n); } -- 2.20.1