From owner-svn-src-all@FreeBSD.ORG Sun Feb 13 19:34:49 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 67ABD106566C; Sun, 13 Feb 2011 19:34:49 +0000 (UTC) (envelope-from marcel@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 3BE828FC12; Sun, 13 Feb 2011 19:34:49 +0000 (UTC) Received: from svn.freebsd.org (localhost [127.0.0.1]) by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p1DJYnM2049657; Sun, 13 Feb 2011 19:34:49 GMT (envelope-from marcel@svn.freebsd.org) Received: (from marcel@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id p1DJYnnK049655; Sun, 13 Feb 2011 19:34:49 GMT (envelope-from marcel@svn.freebsd.org) Message-Id: <201102131934.p1DJYnnK049655@svn.freebsd.org> From: Marcel Moolenaar Date: Sun, 13 Feb 2011 19:34:49 +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: r218663 - head/sys/geom/eli 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: Sun, 13 Feb 2011 19:34:49 -0000 Author: marcel Date: Sun Feb 13 19:34:48 2011 New Revision: 218663 URL: http://svn.freebsd.org/changeset/base/218663 Log: Use the preload_fetch_addr() and preload_fetch_size() convenience functions to obtain the address and size of the preloaded key files. Sponsored by: Juniper Networks. Modified: head/sys/geom/eli/g_eli.c Modified: head/sys/geom/eli/g_eli.c ============================================================================== --- head/sys/geom/eli/g_eli.c Sun Feb 13 19:26:51 2011 (r218662) +++ head/sys/geom/eli/g_eli.c Sun Feb 13 19:34:48 2011 (r218663) @@ -981,8 +981,9 @@ g_eli_destroy_geom(struct gctl_req *req static int g_eli_keyfiles_load(struct hmac_ctx *ctx, const char *provider) { - u_char *keyfile, *data, *size; + u_char *keyfile, *data; char *file, name[64]; + size_t size; int i; for (i = 0; ; i++) { @@ -990,15 +991,14 @@ g_eli_keyfiles_load(struct hmac_ctx *ctx keyfile = preload_search_by_type(name); if (keyfile == NULL) return (i); /* Return number of loaded keyfiles. */ - data = preload_search_info(keyfile, MODINFO_ADDR); + data = preload_fetch_addr(keyfile); if (data == NULL) { G_ELI_DEBUG(0, "Cannot find key file data for %s.", name); return (0); } - data = *(void **)data; - size = preload_search_info(keyfile, MODINFO_SIZE); - if (size == NULL) { + size = preload_fetch_size(keyfile); + if (size == 0) { G_ELI_DEBUG(0, "Cannot find key file size for %s.", name); return (0); @@ -1011,15 +1011,16 @@ g_eli_keyfiles_load(struct hmac_ctx *ctx } G_ELI_DEBUG(1, "Loaded keyfile %s for %s (type: %s).", file, provider, name); - g_eli_crypto_hmac_update(ctx, data, *(size_t *)size); + g_eli_crypto_hmac_update(ctx, data, size); } } static void g_eli_keyfiles_clear(const char *provider) { - u_char *keyfile, *data, *size; + u_char *keyfile, *data; char name[64]; + size_t size; int i; for (i = 0; ; i++) { @@ -1027,12 +1028,10 @@ g_eli_keyfiles_clear(const char *provide keyfile = preload_search_by_type(name); if (keyfile == NULL) return; - data = preload_search_info(keyfile, MODINFO_ADDR); - size = preload_search_info(keyfile, MODINFO_SIZE); - if (data == NULL || size == NULL) - continue; - data = *(void **)data; - bzero(data, *(size_t *)size); + data = preload_fetch_addr(keyfile); + size = preload_fetch_size(keyfile); + if (data != NULL && size != 0) + bzero(data, size); } }