Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932603AbcCBBXd (ORCPT ); Tue, 1 Mar 2016 20:23:33 -0500 Received: from mail333.us4.mandrillapp.com ([205.201.137.77]:34623 "EHLO mail333.us4.mandrillapp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755509AbcCAXzY (ORCPT ); Tue, 1 Mar 2016 18:55:24 -0500 DomainKey-Signature: a=rsa-sha1; c=nofws; q=dns; s=mandrill; d=linuxfoundation.org; b=BdUZZU815/2+RfgbbqNROwohJXVRNzY5S9j89mIn6irweeAw/cjJ1tjvT1p379ITKAKUut9kCpFi C2S1AKbeDi9B+t76VCW6LImOseGkl2LLQKoaOcYJby0zIZbv72K4hftRANIdmVZtEUJQG+n6GUvy 8L0Lb5dY0MLajoBkqVw=; From: Greg Kroah-Hartman Subject: [PATCH 4.4 052/342] devm_memremap: Fix error value when memremap failed X-Mailer: git-send-email 2.7.2 To: Cc: Greg Kroah-Hartman , , Toshi Kani , Andrew Morton , Ross Zwisler , Dan Williams Message-Id: <20160301234529.691212771@linuxfoundation.org> In-Reply-To: <20160301234527.990448862@linuxfoundation.org> References: <20160301234527.990448862@linuxfoundation.org> X-Report-Abuse: Please forward a copy of this message, including all headers, to abuse@mandrill.com X-Report-Abuse: You can also report abuse here: http://mandrillapp.com/contact/abuse?id=30481620.6078820e94574e498aa2e31be67b14b6 X-Mandrill-User: md_30481620 Date: Tue, 01 Mar 2016 23:54:00 +0000 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1066 Lines: 39 4.4-stable review patch. If anyone has any objections, please let me know. ------------------ From: Toshi Kani commit 93f834df9c2d4e362dfdc4b05daa0a4e18814836 upstream. devm_memremap() returns an ERR_PTR() value in case of error. However, it returns NULL when memremap() failed. This causes the caller, such as the pmem driver, to proceed and oops later. Change devm_memremap() to return ERR_PTR(-ENXIO) when memremap() failed. Signed-off-by: Toshi Kani Cc: Andrew Morton Reviewed-by: Ross Zwisler Signed-off-by: Dan Williams Signed-off-by: Greg Kroah-Hartman --- kernel/memremap.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) --- a/kernel/memremap.c +++ b/kernel/memremap.c @@ -133,8 +133,10 @@ void *devm_memremap(struct device *dev, if (addr) { *ptr = addr; devres_add(dev, ptr); - } else + } else { devres_free(ptr); + return ERR_PTR(-ENXIO); + } return addr; }