Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S933011AbcDJT0z (ORCPT ); Sun, 10 Apr 2016 15:26:55 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:54958 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S933368AbcDJTTc (ORCPT ); Sun, 10 Apr 2016 15:19:32 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Gabriel Krisman Bertazi , Insu Yun , Brian King , "Martin K. Petersen" , Ben Hutchings Subject: [PATCH 3.14 60/76] ipr: Fix regression when loading firmware Date: Sun, 10 Apr 2016 11:37:08 -0700 Message-Id: <20160410183518.269106257@linuxfoundation.org> X-Mailer: git-send-email 2.8.0 In-Reply-To: <20160410183516.090999097@linuxfoundation.org> References: <20160410183516.090999097@linuxfoundation.org> User-Agent: quilt/0.64 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1652 Lines: 50 3.14-stable review patch. If anyone has any objections, please let me know. ------------------ 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;