From patchwork Thu Mar 27 18:17:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 3899161 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id BC6FCBF540 for ; Thu, 27 Mar 2014 18:18:44 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 0A17B20225 for ; Thu, 27 Mar 2014 18:18:44 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EE43D20256 for ; Thu, 27 Mar 2014 18:18:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756972AbaC0SSm (ORCPT ); Thu, 27 Mar 2014 14:18:42 -0400 Received: from mail-ee0-f49.google.com ([74.125.83.49]:60080 "EHLO mail-ee0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754922AbaC0SSl (ORCPT ); Thu, 27 Mar 2014 14:18:41 -0400 Received: by mail-ee0-f49.google.com with SMTP id c41so3166010eek.22 for ; Thu, 27 Mar 2014 11:18:40 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=MbDw3/b5nyx1t9Wq+5eWvLXHe8Pz9iFkTCFd7KfgOSc=; b=CrU2N0i2YoTQhBt+ZAn0gzixtcdA9sUMdzF10D1z4ebjOvWsxuwvVAhZDyKkX+trEt tKSKY3JrUTiPzVk8u1e//z+fqRGdJx9SKFW1xYLXD3KHJbU/q1gkqruKj9NdhpYmpmRf /WA2mpXOUwV12HVlXMwp08sRTeAmHMdiC0kozXmXJQU9V4L+oUmLaUZdRjErZ7l+/Z/3 LwkR0oC6O7If1IK/LQXU7Y1PHnEgAbMFMxTVjcm6Ep1KZNqXMoY23OaX2YphcKHbM7DH BAsXBfFbnrDlMNf7flivgW9qr5WH/S34NHXuJdscDX438Q5O10M+Vz0VwxLIraVN6aHi m0Sw== X-Gm-Message-State: ALoCoQmXKPHuklp6S3tWRf7LPJs0paG4BjXbcL1ux+W85AK4GDwbhrUJbnEoi+RtJSUTFmxwS/Wd X-Received: by 10.14.204.199 with SMTP id h47mr3129560eeo.48.1395944320150; Thu, 27 Mar 2014 11:18:40 -0700 (PDT) Received: from localhost ([109.110.66.7]) by mx.google.com with ESMTPSA id o5sm5983562eeg.8.2014.03.27.11.18.39 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 27 Mar 2014 11:18:39 -0700 (PDT) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH 07/33] libceph: safely decode max_osd value in osdmap_decode() Date: Thu, 27 Mar 2014 20:17:53 +0200 Message-Id: <1395944299-21970-8-git-send-email-ilya.dryomov@inktank.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1395944299-21970-1-git-send-email-ilya.dryomov@inktank.com> References: <1395944299-21970-1-git-send-email-ilya.dryomov@inktank.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-7.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP max_osd value is not covered by any ceph_decode_need(). Use a safe version of ceph_decode_* macro to decode it. Signed-off-by: Ilya Dryomov Reviewed-by: Alex Elder --- net/ceph/osdmap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/net/ceph/osdmap.c b/net/ceph/osdmap.c index 298d076eee89..ec06010657b3 100644 --- a/net/ceph/osdmap.c +++ b/net/ceph/osdmap.c @@ -687,9 +687,10 @@ static int osdmap_set_max_osd(struct ceph_osdmap *map, int max) static int osdmap_decode(void **p, void *end, struct ceph_osdmap *map) { u16 version; - u32 len, max, i; u32 epoch = 0; void *start = *p; + u32 max; + u32 len, i; int err; struct ceph_pg_pool_info *pi; @@ -736,7 +737,8 @@ static int osdmap_decode(void **p, void *end, struct ceph_osdmap *map) ceph_decode_32_safe(p, end, map->flags, e_inval); - max = ceph_decode_32(p); + /* max_osd */ + ceph_decode_32_safe(p, end, max, e_inval); /* (re)alloc osd arrays */ err = osdmap_set_max_osd(map, max);