From patchwork Thu Nov 3 15:28:45 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chuck Lever X-Patchwork-Id: 123458 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from acsinet15.oracle.com (acsinet15.oracle.com [141.146.126.227]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "acsinet15.oracle.com", Issuer "VeriSign Class 3 International Server CA - G3" (verified OK)) by ozlabs.org (Postfix) with ESMTPS id A1744B6F7E for ; Fri, 4 Nov 2011 02:29:00 +1100 (EST) Received: from ucsinet22.oracle.com (ucsinet22.oracle.com [156.151.31.94]) by acsinet15.oracle.com (Switch-3.4.4/Switch-3.4.4) with ESMTP id pA3FStHQ005626 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Thu, 3 Nov 2011 15:28:56 GMT Received: from oss.oracle.com (oss.oracle.com [141.146.12.120]) by ucsinet22.oracle.com (8.14.4+Sun/8.14.4) with ESMTP id pA3FStab008025 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 3 Nov 2011 15:28:55 GMT Received: from localhost ([127.0.0.1] helo=oss.oracle.com) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1RLzDm-0001js-0c; Thu, 03 Nov 2011 08:28:50 -0700 Received: from acsinet13.oracle.com ([141.146.126.235]) by oss.oracle.com with esmtp (Exim 4.63) (envelope-from ) id 1RLzDk-0001jl-Hk for fedfs-utils-devel@oss.oracle.com; Thu, 03 Nov 2011 08:28:48 -0700 Received: from mail-qw0-f43.google.com (mail-qw0-f43.google.com [209.85.216.43]) by acsinet13.oracle.com (Switch-3.4.4/Switch-3.4.4) with ESMTP id pA3FS6DK015462 (version=TLSv1/SSLv3 cipher=RC4-SHA bits=128 verify=FAIL) for ; Thu, 3 Nov 2011 15:28:48 GMT Received: by mail-qw0-f43.google.com with SMTP id g1so1528086qab.2 for ; Thu, 03 Nov 2011 08:28:48 -0700 (PDT) Received: by 10.224.217.131 with SMTP id hm3mr4844641qab.81.1320334127863; Thu, 03 Nov 2011 08:28:47 -0700 (PDT) Received: from degas.1015granger.net ([99.26.161.222]) by mx.google.com with ESMTPS id gc8sm6327914qab.4.2011.11.03.08.28.46 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 03 Nov 2011 08:28:47 -0700 (PDT) From: Chuck Lever To: fedfs-utils-devel@oss.oracle.com Date: Thu, 03 Nov 2011 11:28:45 -0400 Message-ID: <20111103152845.2445.24530.stgit@degas.1015granger.net> In-Reply-To: <20111103152051.2445.69747.stgit@degas.1015granger.net> References: <20111103152051.2445.69747.stgit@degas.1015granger.net> User-Agent: StGIT/0.14.3 MIME-Version: 1.0 X-Flow-Control-Info: class=ISPs ip=209.85.216.43 ct-class=R6 ct-vol1=0 ct-vol2=0 ct-vol3=0 ct-risk=68 ct-spam1=0 ct-spam2=0 ct-bulk=0 rcpts=1 size=1458 Subject: [fedfs-utils] [PATCH 4/7] libnsdb: Stricter type checking X-BeenThere: fedfs-utils-devel@oss.oracle.com X-Mailman-Version: 2.1.9 Precedence: list Reply-To: fedfs-utils Developers List-Id: fedfs-utils Developers List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: fedfs-utils-devel-bounces@oss.oracle.com Errors-To: fedfs-utils-devel-bounces@oss.oracle.com X-Source-IP: ucsinet22.oracle.com [156.151.31.94] X-CT-RefId: str=0001.0A090205.4EB2B339.00E2:SCFSTAT3865452, ss=1, re=-4.000, fgs=0 For integer LDAP values, replace atoi(3) with something more robust. Signed-off-by: Chuck Lever --- src/libnsdb/ldap.c | 15 +++++++++++++-- 1 files changed, 13 insertions(+), 2 deletions(-) diff --git a/src/libnsdb/ldap.c b/src/libnsdb/ldap.c index acd9672..618b62a 100644 --- a/src/libnsdb/ldap.c +++ b/src/libnsdb/ldap.c @@ -31,6 +31,7 @@ #include #include #include +#include #include #include #include @@ -216,14 +217,24 @@ nsdb_parse_singlevalue_bool(char *attr, struct berval **values, _Bool *result) FedFsStatus nsdb_parse_singlevalue_int(char *attr, struct berval **values, int *result) { + char *endptr; + long tmp; + if (values[1] != NULL) { xlog(L_ERROR, "%s: Expecting only one value for attribute %s", __func__, attr); return FEDFS_ERR_NSDB_RESPONSE; } - /* XXX: Better value type checking, please */ - *result = atoi(values[0]->bv_val); + errno = 0; + tmp = strtol(values[0]->bv_val, &endptr, 10); + if (errno != 0 || *endptr != '\0' || tmp < INT_MIN || tmp > INT_MAX) { + xlog(D_CALL, "%s: Attribute %s contains out-of-range value %.*s", + __func__, attr, values[0]->bv_len, values[0]->bv_val); + return FEDFS_ERR_NSDB_RESPONSE; + } + + *result = (int)tmp; xlog(D_CALL, "%s: Attribute %s contains value %d", __func__, attr, *result); return FEDFS_OK;