From patchwork Fri May 13 06:39:37 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Brian Chrisman X-Patchwork-Id: 781792 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id p4D6dxfD027595 for ; Fri, 13 May 2011 06:39:59 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756494Ab1EMGjz (ORCPT ); Fri, 13 May 2011 02:39:55 -0400 Received: from mail-pz0-f46.google.com ([209.85.210.46]:54628 "EHLO mail-pz0-f46.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756159Ab1EMGjy (ORCPT ); Fri, 13 May 2011 02:39:54 -0400 Received: by pzk9 with SMTP id 9so1043834pzk.19 for ; Thu, 12 May 2011 23:39:54 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:from:to:cc:subject:date:message-id:x-mailer :in-reply-to:references; bh=r4HEIUmO2cPc17C7cs8LFydpwfj/vL6rYPyuE04LZYk=; b=FEfjcBtJQA3pJHpBzzumYT137xKhvlB5WEpShf0USebfNY734W7NpMlQKzo48RHUEw 4FV7n21JBa51Q9RXXhxs8cXPobKbLlUplchBRdjxHisvwF+k8VIMVs+c+qFNaNKZ1gvR FfrjkxxNJCJbTT0qba/C1I9UMJcBle5uFqwu4= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=from:to:cc:subject:date:message-id:x-mailer:in-reply-to:references; b=sxg4hnuNeIpTjjftsrLH2YVNKXBU8JHtAaCq+vQX9Nos1t7SdMwJ4fXmMZGLCB8oTj Wk5RU6/bdUSNDVZkzn3mt7MXQoBTlEuSHHsWalbduoA9ntwQL+E5O/DPuqOtVkFUhmxL Kl7CFyrjctd6RwaAI0NxLqswOMIFwJL66Gwi0= Received: by 10.68.41.9 with SMTP id b9mr1731554pbl.436.1305268794420; Thu, 12 May 2011 23:39:54 -0700 (PDT) Received: from localhost.localdomain (70-35-37-146.static.wiline.com [70.35.37.146]) by mx.google.com with ESMTPS id t7sm1168194pbj.63.2011.05.12.23.39.53 (version=TLSv1/SSLv3 cipher=OTHER); Thu, 12 May 2011 23:39:53 -0700 (PDT) From: Brian Chrisman To: ceph-devel@vger.kernel.org Cc: Brian Chrisman Subject: [PATCH 1/2] fix null deref when callback invoked en route from readdir_r rather than readdirplus_r Date: Thu, 12 May 2011 23:39:37 -0700 Message-Id: <1305268778-18691-2-git-send-email-brchrisman@gmail.com> X-Mailer: git-send-email 1.7.1 In-Reply-To: <1305268778-18691-1-git-send-email-brchrisman@gmail.com> References: <1305268778-18691-1-git-send-email-brchrisman@gmail.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.6 (demeter1.kernel.org [140.211.167.41]); Fri, 13 May 2011 06:39:59 +0000 (UTC) Signed-off-by: Brian Chrisman --- src/client/Client.cc | 8 ++++++-- 1 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/client/Client.cc b/src/client/Client.cc index 8b8fcf1..dbac2c9 100644 --- a/src/client/Client.cc +++ b/src/client/Client.cc @@ -4330,8 +4330,12 @@ static int _readdir_single_dirent_cb(void *p, struct dirent *de, struct stat *st return -1; *c->de = *de; - *c->st = *st; - *c->stmask = stmask; + if (c->st) { + *c->st = *st; + } + if (c->stmask) { + *c->stmask = stmask; + } c->full = true; return 0; }