From patchwork Mon Jul 21 09:38:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "De Cesco, Jonathan" X-Patchwork-Id: 372013 Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from maxx.maxx.shmoo.com (maxx.shmoo.com [205.134.188.171]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 91A3E14011E for ; Mon, 21 Jul 2014 19:38:51 +1000 (EST) Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 8D5119D2CD; Mon, 21 Jul 2014 05:38:47 -0400 (EDT) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id zG9PZ3vdkojL; Mon, 21 Jul 2014 05:38:47 -0400 (EDT) Received: from maxx.shmoo.com (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id E04869D2C0; Mon, 21 Jul 2014 05:38:40 -0400 (EDT) X-Original-To: mailman-post+hostap@maxx.shmoo.com Delivered-To: mailman-post+hostap@maxx.shmoo.com Received: from localhost (localhost [127.0.0.1]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 487059D2C0 for ; Mon, 21 Jul 2014 05:38:40 -0400 (EDT) X-Virus-Scanned: amavisd-new at maxx.shmoo.com Received: from maxx.maxx.shmoo.com ([127.0.0.1]) by localhost (maxx.shmoo.com [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id pnu-21wBu6uR for ; Mon, 21 Jul 2014 05:38:33 -0400 (EDT) Received: from mga02.intel.com (mga02.intel.com [134.134.136.20]) by maxx.maxx.shmoo.com (Postfix) with ESMTP id 08AC29D2B9 for ; Mon, 21 Jul 2014 05:38:32 -0400 (EDT) Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 21 Jul 2014 02:38:31 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.01,699,1400050800"; d="scan'208";a="576350395" Received: from irsmsx104.ger.corp.intel.com ([163.33.3.159]) by orsmga002.jf.intel.com with ESMTP; 21 Jul 2014 02:38:30 -0700 Received: from irsmsx103.ger.corp.intel.com ([169.254.3.62]) by IRSMSX104.ger.corp.intel.com ([169.254.5.106]) with mapi id 14.03.0123.003; Mon, 21 Jul 2014 10:38:28 +0100 From: "De Cesco, Jonathan" To: "'hostap@lists.shmoo.com'" Subject: [PATCH] Add explicit NULL check before accessing data pointer Thread-Topic: [PATCH] Add explicit NULL check before accessing data pointer Thread-Index: Ac+kxzOVUE/4IhcNThm5NJ1saw2O5A== Date: Mon, 21 Jul 2014 09:38:28 +0000 Message-ID: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-originating-ip: [163.33.239.181] MIME-Version: 1.0 X-BeenThere: hostap@lists.shmoo.com X-Mailman-Version: 2.1.11 Precedence: list List-Id: HostAP Project List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: hostap-bounces@lists.shmoo.com Errors-To: hostap-bounces@lists.shmoo.com Android private lib for nl80211 driver is sending wpa_supplicant_event(drv->ctx, EVENT_CHANNEL_LIST_CHANGED, NULL); For this event, data pointer validity is not checked before access. Signed-off-by: Jonathan DE CESCO --- wpa_supplicant/events.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/wpa_supplicant/events.c b/wpa_supplicant/events.c index 4e84f6e..8cf2dd9 100644 --- a/wpa_supplicant/events.c +++ b/wpa_supplicant/events.c @@ -3369,8 +3369,9 @@ void wpa_supplicant_event(void *ctx, enum wpa_event_type event, wpa_supplicant_set_state(wpa_s, WPA_INTERFACE_DISABLED); break; case EVENT_CHANNEL_LIST_CHANGED: - wpa_supplicant_update_channel_list( - wpa_s, &data->channel_list_changed); + if (data) + wpa_supplicant_update_channel_list( + wpa_s, &data->channel_list_changed); break; case EVENT_INTERFACE_UNAVAILABLE: wpas_p2p_interface_unavailable(wpa_s);