Commit-ID: 7557933e6b99d381c19b196901ed537b00f6d121 Gitweb: http://git.kernel.org/tip/7557933e6b99d381c19b196901ed537b00f6d121 Author: Borislav Petkov <[email protected]> AuthorDate: Mon, 6 Jun 2016 17:10:44 +0200 Committer: Ingo Molnar <[email protected]> CommitDate: Wed, 8 Jun 2016 11:04:19 +0200
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 <[email protected]> Cc: Andy Lutomirski <[email protected]> Cc: Borislav Petkov <[email protected]> Cc: Brian Gerst <[email protected]> Cc: Denys Vlasenko <[email protected]> Cc: H. Peter Anvin <[email protected]> Cc: Linus Torvalds <[email protected]> Cc: Peter Zijlstra <[email protected]> Cc: Thomas Gleixner <[email protected]> Link: http://lkml.kernel.org/r/[email protected] Signed-off-by: Ingo Molnar <[email protected]> --- lib/earlycpio.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/earlycpio.c b/lib/earlycpio.c index 3eb3e47..db283ba 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",
