From owner-svn-src-all@FreeBSD.ORG Sat Nov 26 23:18:20 2011 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 236E2106566B; Sat, 26 Nov 2011 23:18:20 +0000 (UTC) (envelope-from pjd@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 12FC28FC0C; Sat, 26 Nov 2011 23:18:20 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id pAQNIJbW012739; Sat, 26 Nov 2011 23:18:19 GMT (envelope-from pjd@svn.freebsd.org) Received: (from pjd@localhost) by svn.freebsd.org (8.14.4/8.14.4/Submit) id pAQNIJvG012737; Sat, 26 Nov 2011 23:18:19 GMT (envelope-from pjd@svn.freebsd.org) Message-Id: <201111262318.pAQNIJvG012737@svn.freebsd.org> From: Pawel Jakub Dawidek Date: Sat, 26 Nov 2011 23:18:19 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Cc: Subject: svn commit: r228011 - head/sys/netipsec X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 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: Sat, 26 Nov 2011 23:18:20 -0000 Author: pjd Date: Sat Nov 26 23:18:19 2011 New Revision: 228011 URL: http://svn.freebsd.org/changeset/base/228011 Log: malloc(M_WAITOK) never fails, so there is no need to check for NULL. Modified: head/sys/netipsec/xform_esp.c Modified: head/sys/netipsec/xform_esp.c ============================================================================== --- head/sys/netipsec/xform_esp.c Sat Nov 26 23:15:28 2011 (r228010) +++ head/sys/netipsec/xform_esp.c Sat Nov 26 23:18:19 2011 (r228011) @@ -195,10 +195,6 @@ esp_init(struct secasvar *sav, struct xf */ sav->ivlen = (txform == &enc_xform_null ? 0 : txform->blocksize); sav->iv = (caddr_t) malloc(sav->ivlen, M_XDATA, M_WAITOK); - if (sav->iv == NULL) { - DPRINTF(("%s: no memory for IV\n", __func__)); - return EINVAL; - } key_randomfill(sav->iv, sav->ivlen); /*XXX*/ /*