From patchwork Thu Dec 9 18:53:22 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Vangelis Koukis X-Patchwork-Id: 395722 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 oB9JbH9P008983 for ; Thu, 9 Dec 2010 19:37:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753609Ab0LIThQ (ORCPT ); Thu, 9 Dec 2010 14:37:16 -0500 Received: from diomedes.noc.ntua.gr ([147.102.222.220]:62094 "EHLO diomedes.noc.ntua.gr" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752243Ab0LIThP (ORCPT ); Thu, 9 Dec 2010 14:37:15 -0500 X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 09 Dec 2010 19:37:17 +0000 (UTC) X-Greylist: delayed 2631 seconds by postgrey-1.27 at vger.kernel.org; Thu, 09 Dec 2010 14:37:14 EST Received: from danaos.cslab.ece.ntua.gr (danaos.cslab.ece.ntua.gr [147.102.3.1]) by diomedes.noc.ntua.gr (8.14.4/8.14.4) with ESMTP id oB9IrMr6005878 for ; Thu, 9 Dec 2010 20:53:22 +0200 (EET) (envelope-from vangelis@daedalus.cslab.ece.ntua.gr) Received: from daedalus.cslab.ece.ntua.gr (daedalus.cslab.ece.ntua.gr [147.102.3.98]) by danaos.cslab.ece.ntua.gr (Postfix) with ESMTP id 7F697B8199 for ; Thu, 9 Dec 2010 20:53:22 +0200 (EET) Received: by daedalus.cslab.ece.ntua.gr (Postfix, from userid 1000) id 725B8D09C; Thu, 9 Dec 2010 20:53:22 +0200 (EET) Date: Thu, 9 Dec 2010 20:53:22 +0200 From: Vangelis Koukis To: ceph-devel@vger.kernel.org Subject: [PATCH] Fix overflow in FileJournal::_open_file() Message-ID: <20101209185322.GD21271@daedalus.cslab.ece.ntua.gr> MIME-Version: 1.0 Content-Disposition: inline Organization: Computing Systems Laboratory, NTUA User-Agent: Mutt/1.5.20 (2009-06-14) X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.2.6 (diomedes.noc.ntua.gr [147.102.222.220]); Thu, 09 Dec 2010 20:53:22 +0200 (EET) X-Virus-Scanned: clamav-milter 0.96.5 at diomedes.noc.ntua.gr X-Virus-Status: Clean Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org diff --git a/src/os/FileJournal.cc b/src/os/FileJournal.cc index 3bb38a8..cd0808f 100644 --- a/src/os/FileJournal.cc +++ b/src/os/FileJournal.cc @@ -223,7 +223,7 @@ int FileJournal::_open_file(int64_t oldsize, blksize_t blksize, } if (create && (oldsize < conf_journal_sz)) { - uint64_t newsize = g_conf.osd_journal_size << 20; + uint64_t newsize = (uint64_t)g_conf.osd_journal_size << 20; dout(10) << "_open extending to " << newsize << " bytes" << dendl; ret = ::ftruncate(fd, newsize); if (ret < 0) {