From patchwork Wed Mar 13 03:24:30 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Suman Anna X-Patchwork-Id: 2260951 Return-Path: X-Original-To: patchwork-linux-omap@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork2.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork2.kernel.org (Postfix) with ESMTP id 49774DF215 for ; Wed, 13 Mar 2013 03:31:16 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932937Ab3CMD3l (ORCPT ); Tue, 12 Mar 2013 23:29:41 -0400 Received: from arroyo.ext.ti.com ([192.94.94.40]:33065 "EHLO arroyo.ext.ti.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756006Ab3CMD3k (ORCPT ); Tue, 12 Mar 2013 23:29:40 -0400 Received: from dlelxv30.itg.ti.com ([172.17.2.17]) by arroyo.ext.ti.com (8.13.7/8.13.7) with ESMTP id r2D3TI4s012547; Tue, 12 Mar 2013 22:29:18 -0500 Received: from DLEE71.ent.ti.com (dlee71.ent.ti.com [157.170.170.114]) by dlelxv30.itg.ti.com (8.13.8/8.13.8) with ESMTP id r2D3TI1a007089; Tue, 12 Mar 2013 22:29:18 -0500 Received: from dlelxv22.itg.ti.com (172.17.1.197) by DLEE71.ent.ti.com (157.170.170.114) with Microsoft SMTP Server id 14.2.342.3; Tue, 12 Mar 2013 22:29:18 -0500 Received: from localhost (irmo.am.dhcp.ti.com [128.247.74.241]) by dlelxv22.itg.ti.com (8.13.8/8.13.8) with ESMTP id r2D3TIQt011188; Tue, 12 Mar 2013 22:29:18 -0500 From: Suman Anna To: Greg Kroah-Hartman CC: Linus Walleij , Russell King , Arnd Bergmann , Tony Lindgren , Ohad Ben-Cohen , , , , Omar Ramirez Luna , Loic Pallardy , Suman Anna , Fernando Guzman Lugo Subject: [PATCHv3 13/14] mailbox: check for NULL nb in mailbox_put Date: Tue, 12 Mar 2013 22:24:30 -0500 Message-ID: <1363145070-14786-1-git-send-email-s-anna@ti.com> X-Mailer: git-send-email 1.8.1.2 MIME-Version: 1.0 Sender: linux-omap-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-omap@vger.kernel.org The mailbox_put function must check the notifier block for NULL before trying to unregister it. Signed-off-by: Fernando Guzman Lugo Signed-off-by: Suman Anna --- drivers/mailbox/mailbox.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mailbox/mailbox.c b/drivers/mailbox/mailbox.c index eaaf87e..c38241a 100644 --- a/drivers/mailbox/mailbox.c +++ b/drivers/mailbox/mailbox.c @@ -473,7 +473,8 @@ EXPORT_SYMBOL(mailbox_get); void mailbox_put(struct mailbox *mbox, struct notifier_block *nb) { - blocking_notifier_chain_unregister(&mbox->notifier, nb); + if (nb) + blocking_notifier_chain_unregister(&mbox->notifier, nb); mailbox_fini(mbox); } EXPORT_SYMBOL(mailbox_put);