From owner-svn-src-all@FreeBSD.ORG Tue Dec 18 16:16:17 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id E5F2FEE6; Tue, 18 Dec 2012 16:16:17 +0000 (UTC) (envelope-from monthadar@gmail.com) Received: from mail-wg0-f50.google.com (mail-wg0-f50.google.com [74.125.82.50]) by mx1.freebsd.org (Postfix) with ESMTP id B16AA8FC1D; Tue, 18 Dec 2012 16:16:16 +0000 (UTC) Received: by mail-wg0-f50.google.com with SMTP id es5so391196wgb.17 for ; Tue, 18 Dec 2012 08:16:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=mime-version:in-reply-to:references:date:message-id:subject:from:to :cc:content-type; bh=6KOFlOEn0D8HUfDABnykxN+VKmVkCApN4Cugk+MCsm0=; b=I2/eOi1FzPPr+UNMPKhcXTkdgY8XXPGLlUlZ7q1/qX74Hsr1smzq0sJQDA+MfNofhm rQQwIzAQvRxScfbGHHQDiaINW1Z9K6R5ZGnxNZKg66M8fcN5+IL4ogHoGuYvJZyE6udz L+rMtwC/7CIls1LbcjRJIsaX/cPpYe+VgGIrtoC9mYRhPyWXQO4tJo1WXhwwOBx3oRcs Hyms2A6n2QAcnJtTjGF+wz8fqHHX7mF8mbWo0WH0fdvqiUDdAZlMeiS6O/OOdUWvVcT2 8XKPSx91iipuYjN3+XihdA4eOKnBXUtxrREE9rlHKdmkNJSxiOET4EoYEeKrfoI3ghK5 zVNA== MIME-Version: 1.0 Received: by 10.194.236.68 with SMTP id us4mr5684420wjc.11.1355847369340; Tue, 18 Dec 2012 08:16:09 -0800 (PST) Received: by 10.227.59.19 with HTTP; Tue, 18 Dec 2012 08:16:09 -0800 (PST) In-Reply-To: <20121218131300.GP94420@FreeBSD.org> References: <201212180844.qBI8ixdX097633@svn.freebsd.org> <20121218085306.GK94420@FreeBSD.org> <20121218131300.GP94420@FreeBSD.org> Date: Tue, 18 Dec 2012 17:16:09 +0100 Message-ID: Subject: Re: svn commit: r244389 - head/sys/dev/wtap From: Monthadar Al Jaberi To: Gleb Smirnoff Content-Type: text/plain; charset=ISO-8859-1 Cc: Monthadar Al Jaberi , svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Dec 2012 16:16:18 -0000 On Tue, Dec 18, 2012 at 2:13 PM, Gleb Smirnoff wrote: > On Tue, Dec 18, 2012 at 12:30:53PM +0100, Monthadar Al Jaberi wrote: > M> On Tue, Dec 18, 2012 at 9:53 AM, Gleb Smirnoff wrote: > M> > Monthadar, > M> > > M> > On Tue, Dec 18, 2012 at 08:44:59AM +0000, Monthadar Al Jaberi wrote: > M> > M> Author: monthadar > M> > M> Date: Tue Dec 18 08:44:59 2012 > M> > M> New Revision: 244389 > M> > M> URL: http://svnweb.freebsd.org/changeset/base/244389 > M> > M> > M> > M> Log: > M> > M> wtap should check if ieee80211_vap_setup fails. > M> > M> > M> > M> * If ieee80211_vap_setup fails, we free allocated M_80211_VAP > M> > M> memory and return NULL; > M> > M> > M> > M> Approved by: adrian (mentor) > M> > M> > M> > M> Modified: > M> > M> head/sys/dev/wtap/if_wtap.c > M> > M> > M> > M> Modified: head/sys/dev/wtap/if_wtap.c > M> > M> ============================================================================== > M> > M> --- head/sys/dev/wtap/if_wtap.c Tue Dec 18 08:41:23 2012 (r244388) > M> > M> +++ head/sys/dev/wtap/if_wtap.c Tue Dec 18 08:44:59 2012 (r244389) > M> > M> @@ -334,6 +334,10 @@ wtap_vap_create(struct ieee80211com *ic, > M> > M> vap = (struct ieee80211vap *) avp; > M> > M> error = ieee80211_vap_setup(ic, vap, name, unit, IEEE80211_M_MBSS, > M> > M> flags | IEEE80211_CLONE_NOBEACONS, bssid, mac); > M> > M> + if (error) { > M> > M> + free((struct wtap_vap*) vap, M_80211_VAP); > M> > M> + return NULL; > M> > M> + } > M> > M> > M> > M> /* override various methods */ > M> > M> avp->av_recv_mgmt = vap->iv_recv_mgmt; > M> > > M> > You don't need to cast first argument of free(9). And you don't need a cast > M> > before malloc(9) as well. > M> > > M> > If you are calling malloc(9) with M_NOWAIT, you need to check return result. > M> > > M> > Also, more stylish would be to supply to free() the same variable that was > M> > assigned at malloc(9) call, in this particular case it is "avp". > M> > > M> > Patch attached. > M> > M> Thank you for the patch, I can commit it for you, if you havn't done it yet? > > Please commit, I'm not confident with wtap. Done, thank you! > > -- > Totus tuus, Glebius. -- Monthadar Al Jaberi