From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754075AbbATTOb (ORCPT ); Tue, 20 Jan 2015 14:14:31 -0500 Received: from e39.co.us.ibm.com ([32.97.110.160]:46245 "EHLO e39.co.us.ibm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753069AbbATTNP (ORCPT ); Tue, 20 Jan 2015 14:13:15 -0500 From: Mimi Zohar To: initramfs Cc: Mimi Zohar , Al Viro , linux-ima-devel@lists.sourceforge.net, linux-security-module , linux-kernel Subject: [PATCH v1 02/11] initramfs: replace simple_strtoul() with kstrtoul() Date: Tue, 20 Jan 2015 14:12:51 -0500 Message-Id: <1421781180-24425-3-git-send-email-zohar@linux.vnet.ibm.com> X-Mailer: git-send-email 1.8.1.4 In-Reply-To: <1421781180-24425-1-git-send-email-zohar@linux.vnet.ibm.com> References: <1421781180-24425-1-git-send-email-zohar@linux.vnet.ibm.com> X-TM-AS-MML: disable X-Content-Scanned: Fidelis XPS MAILER x-cbid: 15012019-0033-0000-0000-00000364754B Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Replace existing obsolete simple_strtoul() call with kstrtoul(), before making other changes. Signed-off-by: Mimi Zohar --- init/initramfs.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/init/initramfs.c b/init/initramfs.c index bb51b5b..5dd93ca 100644 --- a/init/initramfs.c +++ b/init/initramfs.c @@ -163,12 +163,15 @@ static void __init parse_header(char *s) { unsigned long parsed[12]; char buf[9]; + int ret; int i; buf[8] = '\0'; for (i = 0, s += 6; i < 12; i++, s += 8) { memcpy(buf, s, 8); - parsed[i] = simple_strtoul(buf, NULL, 16); + ret = kstrtoul(buf, 16, &parsed[i]); + if (ret) + pr_err("invalid cpio header field (%d)", ret); } ino = parsed[0]; mode = parsed[1]; -- 1.8.1.4