From patchwork Mon Jun 5 17:05:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 103403 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp2839189vqr; Mon, 5 Jun 2023 10:21:18 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4lEt9dNRzl+q25sl1EqanP+3uYW09elL8SnIkk4Jcwa/A7B3seIU4T613xAJFPDOQfIWBS X-Received: by 2002:a17:903:234b:b0:1ac:b449:352d with SMTP id c11-20020a170903234b00b001acb449352dmr10090790plh.61.1685985677751; Mon, 05 Jun 2023 10:21:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685985677; cv=none; d=google.com; s=arc-20160816; b=ze+VPJ/CnPbT/vbKel+kc75Va1eD6vL9hxpi8LkxXb7ZSdkYKEtMuxy26Ef/eiPowC /mtNhMF/QDkzEaO8yfsTTQhyQGHc4dgjA8VKdzasiL18RUqbUYF9YBs7AaattOyeidZp 13/3oOcV8vBQM2pWG0Ov5547AL1txBqmsN6kQYa6RJtiEQiF7Qzhd64bjcXphIlyfqv8 ViPs9K7423Y6P3KAnyozBJ8q7lC0A0NhLfT+hbvLSie+vn6c1syo/W/2xsfqr3L+3rhH PyKk04Q+vPC9jlt5ihNWfz4JIZvF2j7UvNSCtAhdVE4MOAm6QfS4084gsql+slwtgbev 5zJQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=X9NL69rWqHaMcTkk1q0OJqCDhrn2wmcLoHK+4ZFta4s=; b=BU4k8+kJntbni6cCIfaA4yaAfoB4vYNmeJnFJw87An2Qs12oGDIxuy3URPR7CQZn4z 0lXGhg5a/gVfdJjzg7nUVkFlYf8GxxtIQkMTW0Z+iiwPF9AVlsU/RGsKoV/Ep3IxDJD0 dkh67Wi+qkHAp0FBmfjlMr6HajIi2p3MpTNWODBoT1gIiU/X0Hz17NfC/h0Ik4jg3Jiq aoTW/J8RD+6J+Eg+KBl+AdvQ+C7r50vIL9BVMhzwRnTGHlPttnnrMwjpH8WT7B2wZvYZ y5CkJykTqTQdzK3MQ4K4lwfzq4ThmDOqzOgFxz0mScDbGpC5duUAWTOsEfNDphUEZBsO CcJg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=fLlLmNLk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id b2-20020a170902d50200b001b07c3c31f1si5891321plg.267.2023.06.05.10.21.05; Mon, 05 Jun 2023 10:21:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=fLlLmNLk; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S235291AbjFERGO (ORCPT + 99 others); Mon, 5 Jun 2023 13:06:14 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36186 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235187AbjFERGB (ORCPT ); Mon, 5 Jun 2023 13:06:01 -0400 Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 515FDED; Mon, 5 Jun 2023 10:06:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1685984760; x=1717520760; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=KBLjfFtbsCdNjxRprw9OiUI+007+Q0Bv6edzE8t+Abo=; b=fLlLmNLk7EN2fFWVHDienboKYrMJTdfYjtWSnZW81E3ulMkfI/1ldwdU TTuZ5+cADGB7YgIPt6DoRtQV+vHDew6Y1xbYhM4YA709JHONoiNVKIYva hBMZDtgjKx2+ANcFZFjot6biQxwz5F41tAdiQKFNUWUichxnfkWCcLcJN 0uxj/BKh/IkjcZ7kAQgkPwJI6rFPS3ZEeGHfglAhaw3m4psLIWyebc2gA YpC030bVDDBHsfaC3h/1LeL0VGCwVZ+W/N86p5kPWq8lNb+w+rlRAOf4c sSQKc3MxRT1/ntgpdjcVl5OviCBlzT+h3h5ihTa3eBWBOR7dTIqvnaSxu g==; X-IronPort-AV: E=McAfee;i="6600,9927,10732"; a="356431401" X-IronPort-AV: E=Sophos;i="6.00,218,1681196400"; d="scan'208";a="356431401" Received: from fmsmga008.fm.intel.com ([10.253.24.58]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Jun 2023 10:05:52 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10732"; a="773807508" X-IronPort-AV: E=Sophos;i="6.00,218,1681196400"; d="scan'208";a="773807508" Received: from black.fi.intel.com ([10.237.72.28]) by fmsmga008.fm.intel.com with ESMTP; 05 Jun 2023 10:05:50 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 93C65FD; Mon, 5 Jun 2023 20:05:56 +0300 (EEST) From: Andy Shevchenko To: Kees Cook , Greg Kroah-Hartman , Andy Shevchenko , Cezary Rojewski , linux-ext4@vger.kernel.org, linux-kernel@vger.kernel.org Cc: "Theodore Ts'o" , Jan Kara , Andy Shevchenko , "Rafael J. Wysocki" , Jan Kara Subject: [PATCH v3 1/3] jbd2: Avoid printing outside the boundary of the buffer Date: Mon, 5 Jun 2023 20:05:51 +0300 Message-Id: <20230605170553.7835-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230605170553.7835-1-andriy.shevchenko@linux.intel.com> References: <20230605170553.7835-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-4.3 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_NONE,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767884117760901152?= X-GMAIL-MSGID: =?utf-8?q?1767884117760901152?= Theoretically possible that "%pg" will take all room for the j_devname and hence the "-%lu" will go outside the boundary due to unconditional sprintf() in use. To make this code more robust, replace two sequential s*printf():s by a single call and then replace forbidden character. It's possible to do this way, because '/' won't ever be in the result of "-%lu". Reviewed-by: Jan Kara Signed-off-by: Andy Shevchenko --- fs/jbd2/journal.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c index 8ae419152ff6..6e17f8f94dfd 100644 --- a/fs/jbd2/journal.c +++ b/fs/jbd2/journal.c @@ -1491,7 +1491,6 @@ journal_t *jbd2_journal_init_inode(struct inode *inode) { journal_t *journal; sector_t blocknr; - char *p; int err = 0; blocknr = 0; @@ -1515,9 +1514,8 @@ journal_t *jbd2_journal_init_inode(struct inode *inode) journal->j_inode = inode; snprintf(journal->j_devname, sizeof(journal->j_devname), - "%pg", journal->j_dev); - p = strreplace(journal->j_devname, '/', '!'); - sprintf(p, "-%lu", journal->j_inode->i_ino); + "%pg-%lu", journal->j_dev, journal->j_inode->i_ino); + strreplace(journal->j_devname, '/', '!'); jbd2_stats_proc_init(journal); return journal;