From: Masahiro Yamada <masahiroy@kernel.org>
To: David Laight <David.Laight@aculab.com>
Cc: Sasha Levin <sashal@kernel.org>,
"michal.lkml@markovi.net" <michal.lkml@markovi.net>,
"linux-kbuild@vger.kernel.org" <linux-kbuild@vger.kernel.org>,
"linux-kernel@vger.kernel.org" <linux-kernel@vger.kernel.org>,
"torvalds@linux-foundation.org" <torvalds@linux-foundation.org>,
"gregkh@linuxfoundation.org" <gregkh@linuxfoundation.org>
Subject: Re: [PATCH 2/3] kbuild: clamp SUBLEVEL to 255
Date: Tue, 9 Feb 2021 10:58:25 +0900 [thread overview]
Message-ID: <CAK7LNATDts980vwwUOHV4V-HcrYgXMZueFCYzL6ayP3LZegqNA@mail.gmail.com> (raw)
In-Reply-To: <f8aa21157d0848cda0775a174bba05b2@AcuMS.aculab.com>
On Mon, Feb 8, 2021 at 10:48 PM David Laight <David.Laight@aculab.com> wrote:
>
> From: Sasha Levin
> > Sent: 06 February 2021 03:51
> >
> > Right now if SUBLEVEL becomes larger than 255 it will overflow into the
> > territory of PATCHLEVEL, causing havoc in userspace that tests for
> > specific kernel version.
> >
> > While userspace code tests for MAJOR and PATCHLEVEL, it doesn't test
> > SUBLEVEL at any point as ABI changes don't happen in the context of
> > stable tree.
> >
> > Thus, to avoid overflows, simply clamp SUBLEVEL to it's maximum value in
> > the context of LINUX_VERSION_CODE. This does not affect "make
> > kernelversion" and such.
> >
> > Signed-off-by: Sasha Levin <sashal@kernel.org>
> > ---
> > Makefile | 12 +++++++++---
> > 1 file changed, 9 insertions(+), 3 deletions(-)
> >
> > diff --git a/Makefile b/Makefile
> > index 49ac1b7fe8e99..157be50c691e5 100644
> > --- a/Makefile
> > +++ b/Makefile
> > @@ -1258,9 +1258,15 @@ define filechk_utsrelease.h
> > endef
> >
> > define filechk_version.h
> > - echo \#define LINUX_VERSION_CODE $(shell \
> > - expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 0$(SUBLEVEL)); \
> > - echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + (c))'
> > + if [ $(SUBLEVEL) -gt 255 ]; then \
> > + echo \#define LINUX_VERSION_CODE $(shell \
> > + expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + 255); \
> > + else \
> > + echo \#define LINUX_VERSION_CODE $(shell \
> > + expr $(VERSION) \* 65536 + 0$(PATCHLEVEL) \* 256 + $(SUBLEVEL)); \
> > + fi; \
> > + echo '#define KERNEL_VERSION(a,b,c) (((a) << 16) + ((b) << 8) + \
> > + ((c) > 255 ? 255 : (c)))'
> > endef
>
> Why not use KERNEL_VERSION to define LINUX_VERSION_CODE ?
> Basically just:
> echo '#define LINUX_VERSION_CODE KERNEL_VERSION($(VERSION), $(PATCHLEVEL)+0, $(SUBLEVEL)+0)'
It was not possible to macrofy LINUX_VERSION_CODE.
(build error when CONFIG_KALLSYMS is disabled)
Presumably, this restriction will go away
with the following commit in linux-next.
commit e06af0b2ba02fc0cc2219a14c4c04ff0296a6f9f
Author: Masahiro Yamada <masahiroy@kernel.org>
Date: Thu Jan 28 18:42:30 2021 +1100
init/version.c: remove Version_<LINUX_VERSION_CODE> symbol
My plan is to refactor LINUX_VERSION_CODE in the next
development cycle.
> If PATCHLEVEL and SUBLEVEL are guaranteed to be non-empty the +0
> can be removed.
> The patch assumes they are non-empty, the original pre-prended 0
> to stop syntax error for empty version strings.
>
> Note that the expr version will process 08 and 09.
> gcc will treat them as octal, and may error them.
>
> David
>
> -
> Registered Address Lakeside, Bramley Road, Mount Farm, Milton Keynes, MK1 1PT, UK
> Registration No: 1397386 (Wales)
>
--
Best Regards
Masahiro Yamada
next prev parent reply other threads:[~2021-02-09 2:00 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-06 3:50 [PATCH 1/3] Revert "kbuild: give the SUBLEVEL more room in KERNEL_VERSION" Sasha Levin
2021-02-06 3:50 ` [PATCH 2/3] kbuild: clamp SUBLEVEL to 255 Sasha Levin
2021-02-06 12:51 ` Greg KH
2021-02-07 2:52 ` Masahiro Yamada
2021-02-08 13:48 ` David Laight
2021-02-08 14:09 ` gregkh
2021-02-08 15:13 ` David Laight
2021-02-09 1:58 ` Masahiro Yamada [this message]
2021-02-06 3:50 ` [PATCH 3/3] kbuild: introduce KERNEL_VERSION2 and LINUX_VERSION_CODE2 Sasha Levin
2021-02-06 4:01 ` Sasha Levin
2021-02-06 12:45 ` Masahiro Yamada
2021-02-06 14:31 ` Sasha Levin
2021-02-06 12:53 ` Greg KH
2021-02-06 12:54 ` Greg KH
2021-02-06 12:06 ` [PATCH 1/3] Revert "kbuild: give the SUBLEVEL more room in KERNEL_VERSION" Masahiro Yamada
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAK7LNATDts980vwwUOHV4V-HcrYgXMZueFCYzL6ayP3LZegqNA@mail.gmail.com \
--to=masahiroy@kernel.org \
--cc=David.Laight@aculab.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kbuild@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=michal.lkml@markovi.net \
--cc=sashal@kernel.org \
--cc=torvalds@linux-foundation.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).