From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail.linuxfoundation.org ([140.211.169.12]:50150 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755786AbcDJSAx (ORCPT ); Sun, 10 Apr 2016 14:00:53 -0400 Subject: Patch "ipr: Fix regression when loading firmware" has been added to the 3.14-stable tree To: krisman@linux.vnet.ibm.com, ben@decadent.org.uk, brking@linux.vnet.ibm.com, gregkh@linuxfoundation.org, martin.petersen@oracle.com, wuninsu@gmail.com Cc: , From: Date: Sun, 10 Apr 2016 11:00:51 -0700 Message-ID: <146031125119186@kroah.com> MIME-Version: 1.0 Content-Type: text/plain; charset=ANSI_X3.4-1968 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org List-ID: This is a note to let you know that I've just added the patch titled ipr: Fix regression when loading firmware to the 3.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: ipr-fix-regression-when-loading-firmware.patch and it can be found in the queue-3.14 subdirectory. If you, or anyone else, feels it should not be added to the stable tree, please let know about it. >>From 21b81716c6bff24cda52dc75588455f879ddbfe9 Mon Sep 17 00:00:00 2001 From: Gabriel Krisman Bertazi Date: Thu, 25 Feb 2016 13:54:20 -0300 Subject: ipr: Fix regression when loading firmware From: Gabriel Krisman Bertazi commit 21b81716c6bff24cda52dc75588455f879ddbfe9 upstream. Commit d63c7dd5bcb9 ("ipr: Fix out-of-bounds null overwrite") removed the end of line handling when storing the update_fw sysfs attribute. This changed the userpace API because it started refusing writes terminated by a line feed, which broke the update tools we already have. This patch re-adds that handling, so both a write terminated by a line feed or not can make it through with the update. Fixes: d63c7dd5bcb9 ("ipr: Fix out-of-bounds null overwrite") Signed-off-by: Gabriel Krisman Bertazi Cc: Insu Yun Acked-by: Brian King Signed-off-by: Martin K. Petersen Cc: Ben Hutchings Signed-off-by: Greg Kroah-Hartman --- drivers/scsi/ipr.c | 5 +++++ 1 file changed, 5 insertions(+) --- a/drivers/scsi/ipr.c +++ b/drivers/scsi/ipr.c @@ -3946,6 +3946,7 @@ static ssize_t ipr_store_update_fw(struc struct ipr_sglist *sglist; char fname[100]; char *src; + char *endline; int result, dnld_size; if (!capable(CAP_SYS_ADMIN)) @@ -3953,6 +3954,10 @@ static ssize_t ipr_store_update_fw(struc snprintf(fname, sizeof(fname), "%s", buf); + endline = strchr(fname, '\n'); + if (endline) + *endline = '\0'; + if (request_firmware(&fw_entry, fname, &ioa_cfg->pdev->dev)) { dev_err(&ioa_cfg->pdev->dev, "Firmware file %s not found\n", fname); return -EIO; Patches currently in stable-queue which might be from krisman@linux.vnet.ibm.com are queue-3.14/ipr-fix-regression-when-loading-firmware.patch