From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Cyrus-Session-Id: sloti22d1t05-2651967-1524406991-5-15252120169262936410 X-Sieve: CMU Sieve 3.0 X-Spam-known-sender: no X-Spam-score: 0.0 X-Spam-hits: BAYES_00 -1.9, HEADER_FROM_DIFFERENT_DOMAINS 0.25, MAILING_LIST_MULTI -1, ME_NOAUTH 0.01, RCVD_IN_DNSWL_HI -5, LANGUAGES en, BAYES_USED global, SA_VERSION 3.4.0 X-Spam-source: IP='209.132.180.67', Host='vger.kernel.org', Country='US', FromHeader='org', MailFrom='org' X-Spam-charsets: plain='UTF-8' X-Resolved-to: greg@kroah.com X-Delivered-to: greg@kroah.com X-Mail-from: stable-owner@vger.kernel.org ARC-Seal: i=1; a=rsa-sha256; cv=none; d=messagingengine.com; s=fm2; t= 1524406991; b=BZZNBGRw9/v+drkodDcP9ws1+tp9FL3l4BJxxyNeAnPrs/jOOb 7ZVX5qoIeJosvpBvtTXK7RwBvHZn8FSuxiW9oKTX6GyUOEmrw4ZtMzBsC6tjRcXu dAz75dyZ9lJEnQooz7WSZ9nxB6FP54X+IEcJoTNGKwK39yN5hpEirOR8M4Pl8Eot Mdbnrlsj5m53ce7JmpCTsFBb81wAld2wVFaFd1J8lUXXNaVFWw3MXIcut69Xy18h 65ghGZ2KIxtDMCjVweRZ5C7fOqlFIrf8cN3up9PwH+DxzRIoMe9eAUy+imSJf9rJ XLpfWSxOJRsnpYiZNm0+QyF/2sov08s50faw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d= messagingengine.com; h=from:to:cc:subject:date:message-id :in-reply-to:references:mime-version:content-type:sender :list-id; s=fm2; t=1524406991; bh=K1BHLbJRMqLsnGGf2PRR7NL71Hkce3 OfWE5s5/3SHLg=; b=Gak17AAxSgqjCKo9S/xv3VHSPw1yCLEFug3KP/8eZ3az3H X3W2UVJaOn228mc2hQYW3K+RY7XJX+uwZdSWZ6CcrqzKRo++TMKeZKk1e/Qge74t 2dMjYAd/oC2eOEOKw2b4oRtiDacj8qg818G3uf4ZTHmoV5uLNdlmmriUkSGiLCjJ VmgmuaADhxiVP6yG/iSTW9DL/qQ+EHNpw4u9oUhzgmBSee6MPFgmF0HxN3teNPNO zqHZwQShf2JKaE530Et3/K7UhYOC1t02b07hcGFnMTq+surhwS383CX8wp+XxumG ArmLNmhS5MkKXyV6mojuEQNv/fIZBOgCl6+on9kg== ARC-Authentication-Results: i=1; mx5.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 Authentication-Results: mx5.messagingengine.com; arc=none (no signatures found); dkim=none (no signatures found); dmarc=none (p=none,has-list-id=yes,d=none) header.from=linuxfoundation.org; iprev=pass policy.iprev=209.132.180.67 (vger.kernel.org); spf=none smtp.mailfrom=stable-owner@vger.kernel.org smtp.helo=vger.kernel.org; x-aligned-from=fail; x-cm=none score=0; x-ptr=pass x-ptr-helo=vger.kernel.org x-ptr-lookup=vger.kernel.org; x-return-mx=pass smtp.domain=vger.kernel.org smtp.result=pass smtp_org.domain=kernel.org smtp_org.result=pass smtp_is_org_domain=no header.domain=linuxfoundation.org header.result=pass header_is_org_domain=yes; x-vs=clean score=-100 state=0 X-ME-VSCategory: clean X-CM-Envelope: MS4wfDlaPLUEzMwdZqqtfu4NYeVPX3CUzqy7uVOP8Hr1BULLdtFbRaJxHv5u0D03Is688MlWj+Wlh/ywtxyHA2BTexL+no+LtK/CHuDBBGbkf9gyyXmLRarl ML8cdLghP5tTOVbtddEAu/gSj5g9ebC8Od5g4BOMpJI9RIqmUsjjF5FiImXODJ8CjsDoqBMZNykvtic9IXfmHs1bBXwMNGvCQwUGloig5U65utmx4AM74cqy X-CM-Analysis: v=2.3 cv=NPP7BXyg c=1 sm=1 tr=0 a=UK1r566ZdBxH71SXbqIOeA==:117 a=UK1r566ZdBxH71SXbqIOeA==:17 a=IkcTkHD0fZMA:10 a=Kd1tUaAdevIA:10 a=pGLkceISAAAA:8 a=VwQbUJbxAAAA:8 a=VnNF1IyMAAAA:8 a=ag1SF4gXAAAA:8 a=waIFDghFA1IxNhTx7kcA:9 a=QEXdDO2ut3YA:10 a=AjGcO6oz07-iQ99wixmX:22 a=Yupwre4RP9_Eg_Bd0iYG:22 X-ME-CMScore: 0 X-ME-CMCategory: none Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1757300AbeDVOWX (ORCPT ); Sun, 22 Apr 2018 10:22:23 -0400 Received: from mail.linuxfoundation.org ([140.211.169.12]:33406 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1757685AbeDVOWV (ORCPT ); Sun, 22 Apr 2018 10:22:21 -0400 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Nicholas Piggin , Vasant Hegde , Stewart Smith , Michael Ellerman Subject: [PATCH 3.18 19/52] powerpc/powernv: Handle unknown OPAL errors in opal_nvram_write() Date: Sun, 22 Apr 2018 15:53:52 +0200 Message-Id: <20180422135316.159045856@linuxfoundation.org> X-Mailer: git-send-email 2.17.0 In-Reply-To: <20180422135315.254787616@linuxfoundation.org> References: <20180422135315.254787616@linuxfoundation.org> User-Agent: quilt/0.65 X-stable: review MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Sender: stable-owner@vger.kernel.org X-Mailing-List: stable@vger.kernel.org X-getmail-retrieved-from-mailbox: INBOX X-Mailing-List: linux-kernel@vger.kernel.org List-ID: 3.18-stable review patch. If anyone has any objections, please let me know. ------------------ From: Nicholas Piggin commit 741de617661794246f84a21a02fc5e327bffc9ad upstream. opal_nvram_write currently just assumes success if it encounters an error other than OPAL_BUSY or OPAL_BUSY_EVENT. Have it return -EIO on other errors instead. Fixes: 628daa8d5abf ("powerpc/powernv: Add RTC and NVRAM support plus RTAS fallbacks") Cc: stable@vger.kernel.org # v3.2+ Signed-off-by: Nicholas Piggin Reviewed-by: Vasant Hegde Acked-by: Stewart Smith Signed-off-by: Michael Ellerman Signed-off-by: Greg Kroah-Hartman --- arch/powerpc/platforms/powernv/opal-nvram.c | 4 ++++ 1 file changed, 4 insertions(+) --- a/arch/powerpc/platforms/powernv/opal-nvram.c +++ b/arch/powerpc/platforms/powernv/opal-nvram.c @@ -58,6 +58,10 @@ static ssize_t opal_nvram_write(char *bu if (rc == OPAL_BUSY_EVENT) opal_poll_events(NULL); } + + if (rc) + return -EIO; + *index += count; return count; }