summaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorBorislav Petkov <bp@suse.de>2016-06-06 17:10:44 +0200
committerIngo Molnar <mingo@kernel.org>2016-06-08 11:04:19 +0200
commit7557933e6b99d381c19b196901ed537b00f6d121 (patch)
treead44428540f33df71b41daa475423f99685e3586 /lib
parent4b703305d98bf7350d4b2953ee39a3aa2eeb1778 (diff)
downloadlinux-stable-7557933e6b99d381c19b196901ed537b00f6d121.tar.gz
linux-stable-7557933e6b99d381c19b196901ed537b00f6d121.tar.bz2
linux-stable-7557933e6b99d381c19b196901ed537b00f6d121.zip
lib/cpio: Make find_cpio_data()'s offset arg optional
Some callers don't use it so make it optional. Signed-off-by: Borislav Petkov <bp@suse.de> Cc: Andy Lutomirski <luto@amacapital.net> Cc: Borislav Petkov <bp@alien8.de> Cc: Brian Gerst <brgerst@gmail.com> Cc: Denys Vlasenko <dvlasenk@redhat.com> Cc: H. Peter Anvin <hpa@zytor.com> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Link: http://lkml.kernel.org/r/1465225850-7352-4-git-send-email-bp@alien8.de Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib')
-rw-r--r--lib/earlycpio.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/earlycpio.c b/lib/earlycpio.c
index 3eb3e4722b8e..db283ba4d2c1 100644
--- a/lib/earlycpio.c
+++ b/lib/earlycpio.c
@@ -125,7 +125,10 @@ struct cpio_data find_cpio_data(const char *path, void *data,
if ((ch[C_MODE] & 0170000) == 0100000 &&
ch[C_NAMESIZE] >= mypathsize &&
!memcmp(p, path, mypathsize)) {
- *nextoff = (long)nptr - (long)data;
+
+ if (nextoff)
+ *nextoff = (long)nptr - (long)data;
+
if (ch[C_NAMESIZE] - mypathsize >= MAX_CPIO_FILE_NAME) {
pr_warn(
"File %s exceeding MAX_CPIO_FILE_NAME [%d]\n",