From: Thomas Graf Date: Tue, 3 May 2005 21:27:35 +0000 (-0700) Subject: [RTNETLINK] Fix RTM_MAX to represent the maximum valid message type X-Git-Tag: v2.6.12-rc4~117^2~23^2~21 X-Git-Url: http://ftp.safe.ca/?a=commitdiff_plain;h=d775fc09f16f4b88cd0373006b112c4772589778;p=safe%2Fjmp%2Flinux-2.6 [RTNETLINK] Fix RTM_MAX to represent the maximum valid message type RTM_MAX is currently set to the maximum reserverd message type plus one thus being the cause of two bugs for new types being assigned a) given the new family registers only the NEW command in its reserved block the array size for per family entries is calculated one entry short and b) given the new family registers all commands RTM_MAX would point to the first entry of the block following this one and the rtnetlink receive path would accept a message type for a nonexisting family. This patch changes RTM_MAX to point to the maximum valid message type by aligning it to the start of the next block and subtracting one. Signed-off-by: Thomas Graf Signed-off-by: David S. Miller --- diff --git a/include/linux/rtnetlink.h b/include/linux/rtnetlink.h index 32e5276..d607219 100644 --- a/include/linux/rtnetlink.h +++ b/include/linux/rtnetlink.h @@ -89,8 +89,8 @@ enum { RTM_GETANYCAST = 62, #define RTM_GETANYCAST RTM_GETANYCAST - RTM_MAX, -#define RTM_MAX RTM_MAX + __RTM_MAX, +#define RTM_MAX (((__RTM_MAX + 3) & ~3) - 1) }; /*