From mboxrd@z Thu Jan 1 00:00:00 1970 From: Alex Elder Subject: Re: [PATCH v2 1/3] libceph: fix overflow in __decode_pool_names() Date: Wed, 06 Jun 2012 14:14:53 -0500 Message-ID: <4FCFAC2D.2010008@inktank.com> References: <1335682765-1643-1-git-send-email-xi.wang@gmail.com> <4F9CE8A0.80306@gmail.com> <4FCF849F.7000704@dreamhost.com> <3035A1C4-C66F-41F7-AA9B-7331F0ACA750@gmail.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Return-path: Received: from mail-gh0-f174.google.com ([209.85.160.174]:48467 "EHLO mail-gh0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752062Ab2FFTOs (ORCPT ); Wed, 6 Jun 2012 15:14:48 -0400 Received: by ghrr11 with SMTP id r11so5623604ghr.19 for ; Wed, 06 Jun 2012 12:14:48 -0700 (PDT) In-Reply-To: <3035A1C4-C66F-41F7-AA9B-7331F0ACA750@gmail.com> Sender: ceph-devel-owner@vger.kernel.org List-ID: To: Xi Wang Cc: Sage Weil , ceph-devel@vger.kernel.org On 06/06/2012 12:54 PM, Xi Wang wrote: > On Jun 6, 2012, at 12:26 PM, Alex Elder wrote: >>> diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c >>> index 29ad46e..f80afc3 100644 >>> --- a/net/ceph/osdmap.c >>> +++ b/net/ceph/osdmap.c >>> @@ -495,15 +495,12 @@ static int __decode_pool_names(void **p, void *end, struct ceph_osdmap *map) >>> ceph_decode_32_safe(p, end, pool, bad); >>> ceph_decode_32_safe(p, end, len, bad); >>> dout(" pool %d len %d\n", pool, len); >>> + ceph_decode_need(p, end, len, bad); >>> pi = __lookup_pg_pool(&map->pg_pools, pool); >>> if (pi) { >>> kfree(pi->name); >>> - pi->name = kmalloc(len + 1, GFP_NOFS); >>> - if (pi->name) { >>> - memcpy(pi->name, *p, len); >>> - pi->name[len] = '\0'; >>> - dout(" name is %s\n", pi->name); >>> - } >>> + pi->name = kstrndup(*p, len, GFP_NOFS); >>> + dout(" name is %s\n", pi->name); >> >> Instead: >> if (pi) { >> char *name = kstrndup(*p, len, GFP_NOFS); >> >> if (!name) >> return -ENOMEM; >> kfree(pi->name); >> pi->name = name; >> dout(" name is %s\n", pi->name); >> } > > Looks good to me. Thanks! > > Do you want me to send another patch? Nope. It's already done, I just wasn't going to commit it without hearing back from you. Thanks. -Alex