Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use CMSG_LEN and SOCKCREDSIZE macros to validate length because when

Browse Source 
there are zero extra groups, the size of the cmsg is smaller than
sizeof(struct sockcred). This fixes a problem with registering
services during rc.d

while here, validate the pdu header length before using the contents
This commit is contained in:
plunky 2007-02-22 20:49:32 +00:00
parent 31286c4ea7
commit 7c710de82e
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
usr.sbin/sdpd/server.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: server.c,v 1.1 2006/06/19 15:44:56 gdamore Exp $ */ /* $NetBSD: server.c,v 1.2 2007/02/22 20:49:32 plunky Exp $ */
/*- /*-
* Copyright (c) 2006 Itronix Inc. * Copyright (c) 2006 Itronix Inc.
@ -55,12 +55,12 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* $Id: server.c,v 1.1 2006/06/19 15:44:56 gdamore Exp $ * $Id: server.c,v 1.2 2007/02/22 20:49:32 plunky Exp $
* $FreeBSD: src/usr.sbin/bluetooth/sdpd/server.c,v 1.2 2005/12/06 17:56:36 emax Exp $ * $FreeBSD: src/usr.sbin/bluetooth/sdpd/server.c,v 1.2 2005/12/06 17:56:36 emax Exp $
*/ */
#include <sys/cdefs.h> #include <sys/cdefs.h>
__RCSID("$NetBSD: server.c,v 1.1 2006/06/19 15:44:56 gdamore Exp $"); __RCSID("$NetBSD: server.c,v 1.2 2007/02/22 20:49:32 plunky Exp $");
#include <sys/param.h> #include <sys/param.h>
#include <sys/select.h> #include <sys/select.h>
@ -463,12 +463,13 @@ server_process_request(server_p srv, int32_t fd)
if ((cmsg = CMSG_FIRSTHDR(&msg)) != NULL if ((cmsg = CMSG_FIRSTHDR(&msg)) != NULL
&& cmsg->cmsg_level == SOL_SOCKET && cmsg->cmsg_level == SOL_SOCKET
&& cmsg->cmsg_type == SCM_CREDS && cmsg->cmsg_type == SCM_CREDS
&& cmsg->cmsg_len >= sizeof(*cmsg) + sizeof(*cred) && cmsg->cmsg_len >= CMSG_LEN(SOCKCREDSIZE(0))
&& (cred = (struct sockcred *)CMSG_DATA(cmsg)) != NULL && (cred = (struct sockcred *)CMSG_DATA(cmsg)) != NULL
&& (cred->sc_uid == 0 || cred->sc_euid == 0)) && (cred->sc_uid == 0 || cred->sc_euid == 0))
srv->fdidx[fd].priv = 1; srv->fdidx[fd].priv = 1;
if (sizeof(*pdu) + (pdu->len = ntohs(pdu->len)) == len) { if (len >= sizeof(*pdu)
&& (sizeof(*pdu) + (pdu->len = ntohs(pdu->len))) == len) {
switch (pdu->pid) { switch (pdu->pid) {
case SDP_PDU_SERVICE_SEARCH_REQUEST: case SDP_PDU_SERVICE_SEARCH_REQUEST:
error = server_prepare_service_search_response(srv, fd); error = server_prepare_service_search_response(srv, fd);