From patchwork Thu Mar 23 12:37:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andy Shevchenko X-Patchwork-Id: 74053 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:604a:0:0:0:0:0 with SMTP id j10csp2886597wrt; Thu, 23 Mar 2023 05:42:33 -0700 (PDT) X-Google-Smtp-Source: AK7set/CsQcjYrBiFRUIhfpm9M8iHNm/48S7NlXpe5no3wmMl0l5KcOVRj70x8dmd9yQpU/r7wtG X-Received: by 2002:a05:6402:742:b0:4fb:3054:232e with SMTP id p2-20020a056402074200b004fb3054232emr9712934edy.26.1679575353274; Thu, 23 Mar 2023 05:42:33 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1679575353; cv=none; d=google.com; s=arc-20160816; b=N9vacN1DC3IQtZ1Y/GHY7AqkKe6jOzUUtKz8lLOpEqpe7Iy6xCDWiLFDcq/7M0Ivsc X+/qt5TcCtoW7AFCjtl6oo9QyJM1S63eCwLB46JvcHMVQpf6mBDbzzac3DtNKIcyodeL uQPlSUdrLG9ELveq2tVl1aXt0Cbrm1J+Ea/v0cnnozzkmouPt1RLA5W8WsAkP54kv692 lbbNmq0bpavYVNFKuRZ7yYK9ttfds6T0kfzD/isIBBlIHpL/+XGOIDk9BtXMGJerIb1m +jgU7ZaW6SJsqmA8a/Pb6GyBO9PgrNsdbUwBi0U64wvOGaUqSc78ZjwVf3TKMU359ifW Wx9A== 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=Z16ih4cqVOH/EwDY9V+JvxP7wVmUGDKkr6F8+Xwy+j8=; b=orADtDIu/RpwUgI4CZyRtjt+cZVZ6qRf169N3hjwUCLD6+u+iB3/OS/CQosB+Q8+du +ZLtm3hWbzBJzffTsK91Uepu0y51Jku5wssqHUuplLEZA0EdTLD9OA2l/b+zb4pbUdwj AFuUIPAa+x0dTbGFP6PvXHBJ4m44qbmFAMO71b0RKidRiBprqJx33m9QIZwtBx57ozCr OIJQHEjijUSlJklR3t0AZv6Fv9oybwHa5mBeqhw2dqf4Op28mS8c2/1ryD4WGYOBNJZD 3lcuvWRQ64b+HFW1oJsJmShZVP4swpUt0qBfPTnh38y5ETzntgAOhu/BhJPF5IYj0Z3s yqzA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@intel.com header.s=Intel header.b=JlFNifkK; 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 b7-20020aa7c6c7000000b004fd241e4783si18563578eds.610.2023.03.23.05.42.10; Thu, 23 Mar 2023 05:42:33 -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=JlFNifkK; 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 S231826AbjCWMgt (ORCPT + 99 others); Thu, 23 Mar 2023 08:36:49 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:38324 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S231848AbjCWMgm (ORCPT ); Thu, 23 Mar 2023 08:36:42 -0400 Received: from mga09.intel.com (mga09.intel.com [134.134.136.24]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id A33071CF41; Thu, 23 Mar 2023 05:36:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1679574998; x=1711110998; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=OAAjRWa/GMe3Eyh4EzhGnD6aqq4E5v6Kahs4zyE3gnQ=; b=JlFNifkK2vnleKWitd8wXZANVEYiicxQLwnQXd87xpz+53z7ivSXme5e LFqVkMfbRvJP46qEMHryBS4MDn3vyHQ+D1UxsHJbeOuoWsMY98G84facW ouoTF3riOFnLy1aoNup3eimJ1HjUhqhC4DWNtKLGXvj+TW12ykCmx2Osi AYcn1BTuhfIMtuVkSEPkuaB3T/QXZ6YEetm/zC/ERsg6Jk4wrj1hV2qsJ r64rGSUDMpLDsJe/jq5xyPWPfuodcVCnqk/z4PEIUMq14kfIz/uX89CpO 8NmlNF78jg8jhnqn2Q6VuREvkwyJwWI7ERw0rqVDLQyjlPdhVa1S2k6kO g==; X-IronPort-AV: E=McAfee;i="6600,9927,10657"; a="341011540" X-IronPort-AV: E=Sophos;i="5.98,283,1673942400"; d="scan'208";a="341011540" Received: from orsmga005.jf.intel.com ([10.7.209.41]) by orsmga102.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 23 Mar 2023 05:36:23 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10657"; a="856466578" X-IronPort-AV: E=Sophos;i="5.98,283,1673942400"; d="scan'208";a="856466578" Received: from black.fi.intel.com ([10.237.72.28]) by orsmga005.jf.intel.com with ESMTP; 23 Mar 2023 05:36:20 -0700 Received: by black.fi.intel.com (Postfix, from userid 1003) id 237F794; Thu, 23 Mar 2023 14:37:07 +0200 (EET) 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 v2 1/3] jbd2: Avoid printing outside the boundary of the buffer Date: Thu, 23 Mar 2023 14:37:02 +0200 Message-Id: <20230323123704.37983-2-andriy.shevchenko@linux.intel.com> X-Mailer: git-send-email 2.40.0.1.gaa8946217a0b In-Reply-To: <20230323123704.37983-1-andriy.shevchenko@linux.intel.com> References: <20230323123704.37983-1-andriy.shevchenko@linux.intel.com> MIME-Version: 1.0 X-Spam-Status: No, score=-2.4 required=5.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL,SPF_HELO_NONE,SPF_NONE autolearn=unavailable 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?1761162405657223542?= X-GMAIL-MSGID: =?utf-8?q?1761162405657223542?= 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". Signed-off-by: Andy Shevchenko Reviewed-by: Jan Kara --- 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;