From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-3.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS autolearn=no autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id E873BC43331 for ; Mon, 11 Nov 2019 09:46:30 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id B63C6206C3 for ; Mon, 11 Nov 2019 09:46:30 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=lists.infradead.org header.i=@lists.infradead.org header.b="D3nqbmJX"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=kernel.org header.i=@kernel.org header.b="l/KO6rtX" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org B63C6206C3 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=linuxfoundation.org Authentication-Results: mail.kernel.org; spf=none smtp.mailfrom=linux-mtd-bounces+linux-mtd=archiver.kernel.org@lists.infradead.org DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:Cc:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:Message-ID:In-Reply-To: Date:From:To:Subject:Reply-To:Content-ID:Content-Description:Resent-Date: Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:References: List-Owner; bh=W7mgE+UdnppM+2O6z4XVSq81eC+VPI0x9f13JqsgXrA=; b=D3nqbmJXxeILTj Ipw9/u5q4KJH/xSAnhUTUbhxRU805g0JhwvYOMNZII4CIZTB6Y6GtDlex52oLZuT6lIoYlfT1IeZB wqRoz3tLpGQ1P6S0cwW0scfYINiJcrxQ1utKDhVimvhDp36yiogrIN9oguN+K/BAigZUPmgIreIYP L30iDeY5amVGMpgyJiN2HyL4VrMuPCS5fge6ut8T2i0mBZehw7rmYek/GErHcKoqJpSCe2GXIYbZ2 wo5mVinloxXZ1VJYwoR4WrUvJxy4T6o0fRp2XB4BlO2AF0qdYbqNC+vAlKkxBBxlMxlgBJmDMs+Pt 7biiVxGgswMo687FoGiA==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.92.3 #3 (Red Hat Linux)) id 1iU6H1-0002Y2-P9; Mon, 11 Nov 2019 09:46:15 +0000 Received: from mail.kernel.org ([198.145.29.99]) by bombadil.infradead.org with esmtps (Exim 4.92.3 #3 (Red Hat Linux)) id 1iU6F5-00083D-64 for linux-mtd@lists.infradead.org; Mon, 11 Nov 2019 09:44:18 +0000 Received: from localhost (83-86-89-107.cable.dynamic.v4.ziggo.nl [83.86.89.107]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id DE6B22084F; Mon, 11 Nov 2019 09:44:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1573465454; bh=TsET5Ad30Z5LGue4BLdCUG4w7ocxMPwtdcZ3SgYKKAw=; h=Subject:To:Cc:From:Date:In-Reply-To:From; b=l/KO6rtXfCILC7AJw9LbvMHJIkjC6q5QK9YqdtvYhoffHwaNMpzpYXPthd8lagr1O K+7Jq9+PnJt3pDckSggAEmmdQnqlYVu7j62B7K1kyvO41Rbi6P2nuLgHiuaN8plbWn lfsu1sRblPsoQ2k8y+Hcmc68jYZ4iEfHfRFOLWP4= Subject: Patch "misc: pci_endpoint_test: Prevent some integer overflows" has been added to the 4.14-stable tree To: dan.carpenter@oracle.com, dri-devel@lists.freedesktop.org, gregkh@linuxfoundation.org, linux-mtd@lists.infradead.org, mathieu.poirier@linaro.org From: Date: Mon, 11 Nov 2019 10:43:33 +0100 In-Reply-To: <20190905161759.28036-10-mathieu.poirier@linaro.org> Message-ID: <157346541354220@kroah.com> MIME-Version: 1.0 X-stable: commit X-Patchwork-Hint: ignore X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20191111_014415_268446_5D348F70 X-CRM114-Status: UNSURE ( 9.05 ) X-CRM114-Notice: Please train this message. X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: stable-commits@vger.kernel.org Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: "linux-mtd" Errors-To: linux-mtd-bounces+linux-mtd=archiver.kernel.org@lists.infradead.org This is a note to let you know that I've just added the patch titled misc: pci_endpoint_test: Prevent some integer overflows to the 4.14-stable tree which can be found at: http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary The filename of the patch is: misc-pci_endpoint_test-prevent-some-integer-overflows.patch and it can be found in the queue-4.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >From foo@baz Mon 11 Nov 2019 10:07:22 AM CET From: Mathieu Poirier Date: Thu, 5 Sep 2019 10:17:50 -0600 Subject: misc: pci_endpoint_test: Prevent some integer overflows To: stable@vger.kernel.org Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, dri-devel@lists.freedesktop.org, linux-omap@vger.kernel.org, linux-i2c@vger.kernel.org, linux-pci@vger.kernel.org, linux-mtd@lists.infradead.org Message-ID: <20190905161759.28036-10-mathieu.poirier@linaro.org> From: Dan Carpenter commit 378f79cab12b669928f3a4037f023837ead2ce0c upstream "size + max" can have an arithmetic overflow when we're allocating: orig_src_addr = dma_alloc_coherent(dev, size + alignment, ... I've added a few checks to prevent that. Fixes: 13107c60681f ("misc: pci_endpoint_test: Add support to provide aligned buffer addresses") Signed-off-by: Dan Carpenter Signed-off-by: Greg Kroah-Hartman Signed-off-by: Mathieu Poirier Signed-off-by: Greg Kroah-Hartman --- drivers/misc/pci_endpoint_test.c | 9 +++++++++ 1 file changed, 9 insertions(+) --- a/drivers/misc/pci_endpoint_test.c +++ b/drivers/misc/pci_endpoint_test.c @@ -226,6 +226,9 @@ static bool pci_endpoint_test_copy(struc u32 src_crc32; u32 dst_crc32; + if (size > SIZE_MAX - alignment) + goto err; + orig_src_addr = dma_alloc_coherent(dev, size + alignment, &orig_src_phys_addr, GFP_KERNEL); if (!orig_src_addr) { @@ -311,6 +314,9 @@ static bool pci_endpoint_test_write(stru size_t alignment = test->alignment; u32 crc32; + if (size > SIZE_MAX - alignment) + goto err; + orig_addr = dma_alloc_coherent(dev, size + alignment, &orig_phys_addr, GFP_KERNEL); if (!orig_addr) { @@ -369,6 +375,9 @@ static bool pci_endpoint_test_read(struc size_t alignment = test->alignment; u32 crc32; + if (size > SIZE_MAX - alignment) + goto err; + orig_addr = dma_alloc_coherent(dev, size + alignment, &orig_phys_addr, GFP_KERNEL); if (!orig_addr) { Patches currently in stable-queue which might be from mathieu.poirier@linaro.org are queue-4.14/mailbox-reset-txdone_method-txdone_by_poll-if-client-knows_txdone.patch queue-4.14/mtd-spi-nor-cadence-quadspi-add-a-delay-in-write-sequence.patch queue-4.14/misc-pci_endpoint_test-fix-bug_on-error-during-pci_disable_msi.patch queue-4.14/asoc-tlv320dac31xx-mark-expected-switch-fall-through.patch queue-4.14/pci-dra7xx-add-shutdown-handler-to-cleanly-turn-off-clocks.patch queue-4.14/asoc-tlv320aic31xx-handle-inverted-bclk-in-non-dsp-modes.patch queue-4.14/mtd-spi-nor-enable-4b-opcodes-for-mx66l51235l.patch queue-4.14/cpufreq-ti-cpufreq-add-missing-of_node_put.patch queue-4.14/asoc-davinci-kill-bug_on-usage.patch queue-4.14/mfd-palmas-assign-the-right-powerhold-mask-for-tps65917.patch queue-4.14/asoc-davinci-mcasp-fix-an-error-handling-path-in-davinci_mcasp_probe.patch queue-4.14/misc-pci_endpoint_test-prevent-some-integer-overflows.patch queue-4.14/asoc-davinci-mcasp-handle-return-value-of-devm_kasprintf.patch queue-4.14/i2c-omap-trigger-bus-recovery-in-lockup-case.patch queue-4.14/usb-dwc3-allow-disabling-of-metastability-workaround.patch ______________________________________________________ Linux MTD discussion mailing list http://lists.infradead.org/mailman/listinfo/linux-mtd/ From mboxrd@z Thu Jan 1 00:00:00 1970 From: Subject: Patch "misc: pci_endpoint_test: Prevent some integer overflows" has been added to the 4.14-stable tree Date: Mon, 11 Nov 2019 10:43:33 +0100 Message-ID: <157346541354220@kroah.com> References: <20190905161759.28036-10-mathieu.poirier@linaro.org> Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: base64 Return-path: Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by gabe.freedesktop.org (Postfix) with ESMTPS id 7ED3C6E886 for ; Mon, 11 Nov 2019 09:44:14 +0000 (UTC) In-Reply-To: <20190905161759.28036-10-mathieu.poirier@linaro.org> List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dri-devel-bounces@lists.freedesktop.org Sender: "dri-devel" To: dan.carpenter@oracle.com, dri-devel@lists.freedesktop.org, gregkh@linuxfoundation.org, linux-mtd@lists.infradead.org, mathieu.poirier@linaro.org Cc: stable-commits@vger.kernel.org List-Id: dri-devel@lists.freedesktop.org ClRoaXMgaXMgYSBub3RlIHRvIGxldCB5b3Uga25vdyB0aGF0IEkndmUganVzdCBhZGRlZCB0aGUg cGF0Y2ggdGl0bGVkCgogICAgbWlzYzogcGNpX2VuZHBvaW50X3Rlc3Q6IFByZXZlbnQgc29tZSBp bnRlZ2VyIG92ZXJmbG93cwoKdG8gdGhlIDQuMTQtc3RhYmxlIHRyZWUgd2hpY2ggY2FuIGJlIGZv dW5kIGF0OgogICAgaHR0cDovL3d3dy5rZXJuZWwub3JnL2dpdC8/cD1saW51eC9rZXJuZWwvZ2l0 L3N0YWJsZS9zdGFibGUtcXVldWUuZ2l0O2E9c3VtbWFyeQoKVGhlIGZpbGVuYW1lIG9mIHRoZSBw YXRjaCBpczoKICAgICBtaXNjLXBjaV9lbmRwb2ludF90ZXN0LXByZXZlbnQtc29tZS1pbnRlZ2Vy LW92ZXJmbG93cy5wYXRjaAphbmQgaXQgY2FuIGJlIGZvdW5kIGluIHRoZSBxdWV1ZS00LjE0IHN1 YmRpcmVjdG9yeS4KCklmIHlvdSwgb3IgYW55b25lIGVsc2UsIGZlZWxzIGl0IHNob3VsZCBub3Qg YmUgYWRkZWQgdG8gdGhlIHN0YWJsZSB0cmVlLApwbGVhc2UgbGV0IDxzdGFibGVAdmdlci5rZXJu ZWwub3JnPiBrbm93IGFib3V0IGl0LgoKCkZyb20gZm9vQGJheiBNb24gMTEgTm92IDIwMTkgMTA6 MDc6MjIgQU0gQ0VUCkZyb206IE1hdGhpZXUgUG9pcmllciA8bWF0aGlldS5wb2lyaWVyQGxpbmFy by5vcmc+CkRhdGU6IFRodSwgIDUgU2VwIDIwMTkgMTA6MTc6NTAgLTA2MDAKU3ViamVjdDogbWlz YzogcGNpX2VuZHBvaW50X3Rlc3Q6IFByZXZlbnQgc29tZSBpbnRlZ2VyIG92ZXJmbG93cwpUbzog c3RhYmxlQHZnZXIua2VybmVsLm9yZwpDYzogbGludXgtdXNiQHZnZXIua2VybmVsLm9yZywgbGlu dXgta2VybmVsQHZnZXIua2VybmVsLm9yZywgbGludXgtcG1Admdlci5rZXJuZWwub3JnLCBkcmkt ZGV2ZWxAbGlzdHMuZnJlZWRlc2t0b3Aub3JnLCBsaW51eC1vbWFwQHZnZXIua2VybmVsLm9yZywg bGludXgtaTJjQHZnZXIua2VybmVsLm9yZywgbGludXgtcGNpQHZnZXIua2VybmVsLm9yZywgbGlu dXgtbXRkQGxpc3RzLmluZnJhZGVhZC5vcmcKTWVzc2FnZS1JRDogPDIwMTkwOTA1MTYxNzU5LjI4 MDM2LTEwLW1hdGhpZXUucG9pcmllckBsaW5hcm8ub3JnPgoKRnJvbTogRGFuIENhcnBlbnRlciA8 ZGFuLmNhcnBlbnRlckBvcmFjbGUuY29tPgoKY29tbWl0IDM3OGY3OWNhYjEyYjY2OTkyOGYzYTQw MzdmMDIzODM3ZWFkMmNlMGMgdXBzdHJlYW0KCiJzaXplICsgbWF4IiBjYW4gaGF2ZSBhbiBhcml0 aG1ldGljIG92ZXJmbG93IHdoZW4gd2UncmUgYWxsb2NhdGluZzoKCglvcmlnX3NyY19hZGRyID0g ZG1hX2FsbG9jX2NvaGVyZW50KGRldiwgc2l6ZSArIGFsaWdubWVudCwgLi4uCgpJJ3ZlIGFkZGVk IGEgZmV3IGNoZWNrcyB0byBwcmV2ZW50IHRoYXQuCgpGaXhlczogMTMxMDdjNjA2ODFmICgibWlz YzogcGNpX2VuZHBvaW50X3Rlc3Q6IEFkZCBzdXBwb3J0IHRvIHByb3ZpZGUgYWxpZ25lZCBidWZm ZXIgYWRkcmVzc2VzIikKU2lnbmVkLW9mZi1ieTogRGFuIENhcnBlbnRlciA8ZGFuLmNhcnBlbnRl ckBvcmFjbGUuY29tPgpTaWduZWQtb2ZmLWJ5OiBHcmVnIEtyb2FoLUhhcnRtYW4gPGdyZWdraEBs aW51eGZvdW5kYXRpb24ub3JnPgpTaWduZWQtb2ZmLWJ5OiBNYXRoaWV1IFBvaXJpZXIgPG1hdGhp ZXUucG9pcmllckBsaW5hcm8ub3JnPgpTaWduZWQtb2ZmLWJ5OiBHcmVnIEtyb2FoLUhhcnRtYW4g PGdyZWdraEBsaW51eGZvdW5kYXRpb24ub3JnPgotLS0KIGRyaXZlcnMvbWlzYy9wY2lfZW5kcG9p bnRfdGVzdC5jIHwgICAgOSArKysrKysrKysKIDEgZmlsZSBjaGFuZ2VkLCA5IGluc2VydGlvbnMo KykKCi0tLSBhL2RyaXZlcnMvbWlzYy9wY2lfZW5kcG9pbnRfdGVzdC5jCisrKyBiL2RyaXZlcnMv bWlzYy9wY2lfZW5kcG9pbnRfdGVzdC5jCkBAIC0yMjYsNiArMjI2LDkgQEAgc3RhdGljIGJvb2wg cGNpX2VuZHBvaW50X3Rlc3RfY29weShzdHJ1YwogCXUzMiBzcmNfY3JjMzI7CiAJdTMyIGRzdF9j cmMzMjsKIAorCWlmIChzaXplID4gU0laRV9NQVggLSBhbGlnbm1lbnQpCisJCWdvdG8gZXJyOwor CiAJb3JpZ19zcmNfYWRkciA9IGRtYV9hbGxvY19jb2hlcmVudChkZXYsIHNpemUgKyBhbGlnbm1l bnQsCiAJCQkJCSAgICZvcmlnX3NyY19waHlzX2FkZHIsIEdGUF9LRVJORUwpOwogCWlmICghb3Jp Z19zcmNfYWRkcikgewpAQCAtMzExLDYgKzMxNCw5IEBAIHN0YXRpYyBib29sIHBjaV9lbmRwb2lu dF90ZXN0X3dyaXRlKHN0cnUKIAlzaXplX3QgYWxpZ25tZW50ID0gdGVzdC0+YWxpZ25tZW50Owog CXUzMiBjcmMzMjsKIAorCWlmIChzaXplID4gU0laRV9NQVggLSBhbGlnbm1lbnQpCisJCWdvdG8g ZXJyOworCiAJb3JpZ19hZGRyID0gZG1hX2FsbG9jX2NvaGVyZW50KGRldiwgc2l6ZSArIGFsaWdu bWVudCwgJm9yaWdfcGh5c19hZGRyLAogCQkJCSAgICAgICBHRlBfS0VSTkVMKTsKIAlpZiAoIW9y aWdfYWRkcikgewpAQCAtMzY5LDYgKzM3NSw5IEBAIHN0YXRpYyBib29sIHBjaV9lbmRwb2ludF90 ZXN0X3JlYWQoc3RydWMKIAlzaXplX3QgYWxpZ25tZW50ID0gdGVzdC0+YWxpZ25tZW50OwogCXUz MiBjcmMzMjsKIAorCWlmIChzaXplID4gU0laRV9NQVggLSBhbGlnbm1lbnQpCisJCWdvdG8gZXJy OworCiAJb3JpZ19hZGRyID0gZG1hX2FsbG9jX2NvaGVyZW50KGRldiwgc2l6ZSArIGFsaWdubWVu dCwgJm9yaWdfcGh5c19hZGRyLAogCQkJCSAgICAgICBHRlBfS0VSTkVMKTsKIAlpZiAoIW9yaWdf YWRkcikgewoKClBhdGNoZXMgY3VycmVudGx5IGluIHN0YWJsZS1xdWV1ZSB3aGljaCBtaWdodCBi ZSBmcm9tIG1hdGhpZXUucG9pcmllckBsaW5hcm8ub3JnIGFyZQoKcXVldWUtNC4xNC9tYWlsYm94 LXJlc2V0LXR4ZG9uZV9tZXRob2QtdHhkb25lX2J5X3BvbGwtaWYtY2xpZW50LWtub3dzX3R4ZG9u ZS5wYXRjaApxdWV1ZS00LjE0L210ZC1zcGktbm9yLWNhZGVuY2UtcXVhZHNwaS1hZGQtYS1kZWxh eS1pbi13cml0ZS1zZXF1ZW5jZS5wYXRjaApxdWV1ZS00LjE0L21pc2MtcGNpX2VuZHBvaW50X3Rl c3QtZml4LWJ1Z19vbi1lcnJvci1kdXJpbmctcGNpX2Rpc2FibGVfbXNpLnBhdGNoCnF1ZXVlLTQu MTQvYXNvYy10bHYzMjBkYWMzMXh4LW1hcmstZXhwZWN0ZWQtc3dpdGNoLWZhbGwtdGhyb3VnaC5w YXRjaApxdWV1ZS00LjE0L3BjaS1kcmE3eHgtYWRkLXNodXRkb3duLWhhbmRsZXItdG8tY2xlYW5s eS10dXJuLW9mZi1jbG9ja3MucGF0Y2gKcXVldWUtNC4xNC9hc29jLXRsdjMyMGFpYzMxeHgtaGFu ZGxlLWludmVydGVkLWJjbGstaW4tbm9uLWRzcC1tb2Rlcy5wYXRjaApxdWV1ZS00LjE0L210ZC1z cGktbm9yLWVuYWJsZS00Yi1vcGNvZGVzLWZvci1teDY2bDUxMjM1bC5wYXRjaApxdWV1ZS00LjE0 L2NwdWZyZXEtdGktY3B1ZnJlcS1hZGQtbWlzc2luZy1vZl9ub2RlX3B1dC5wYXRjaApxdWV1ZS00 LjE0L2Fzb2MtZGF2aW5jaS1raWxsLWJ1Z19vbi11c2FnZS5wYXRjaApxdWV1ZS00LjE0L21mZC1w YWxtYXMtYXNzaWduLXRoZS1yaWdodC1wb3dlcmhvbGQtbWFzay1mb3ItdHBzNjU5MTcucGF0Y2gK cXVldWUtNC4xNC9hc29jLWRhdmluY2ktbWNhc3AtZml4LWFuLWVycm9yLWhhbmRsaW5nLXBhdGgt aW4tZGF2aW5jaV9tY2FzcF9wcm9iZS5wYXRjaApxdWV1ZS00LjE0L21pc2MtcGNpX2VuZHBvaW50 X3Rlc3QtcHJldmVudC1zb21lLWludGVnZXItb3ZlcmZsb3dzLnBhdGNoCnF1ZXVlLTQuMTQvYXNv Yy1kYXZpbmNpLW1jYXNwLWhhbmRsZS1yZXR1cm4tdmFsdWUtb2YtZGV2bV9rYXNwcmludGYucGF0 Y2gKcXVldWUtNC4xNC9pMmMtb21hcC10cmlnZ2VyLWJ1cy1yZWNvdmVyeS1pbi1sb2NrdXAtY2Fz ZS5wYXRjaApxdWV1ZS00LjE0L3VzYi1kd2MzLWFsbG93LWRpc2FibGluZy1vZi1tZXRhc3RhYmls aXR5LXdvcmthcm91bmQucGF0Y2gKX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19fX19f X19fX19fX19fX18KZHJpLWRldmVsIG1haWxpbmcgbGlzdApkcmktZGV2ZWxAbGlzdHMuZnJlZWRl c2t0b3Aub3JnCmh0dHBzOi8vbGlzdHMuZnJlZWRlc2t0b3Aub3JnL21haWxtYW4vbGlzdGluZm8v ZHJpLWRldmVs