Message-ID: <89e3ecb6-0e1a-3d86-cb05-cbb034c68dc4@intel.com>
Date:   Fri, 3 Mar 2023 16:19:51 +0100
User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101
 Thunderbird/102.8.0
Subject: Re: [PATCH] kheaders: Use array declaration instead of char
Content-Language: en-US
To:     Kees Cook <keescook@chromium.org>
CC:     Joel Fernandes <joel@joelfernandes.org>,
        Jakub Kicinski <kuba@kernel.org>, <stable@vger.kernel.org>,
        Masahiro Yamada <yamada.masahiro@socionext.com>,
        Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
        <linux-kernel@vger.kernel.org>, <linux-hardening@vger.kernel.org>
References: <20230302224946.never.243-kees@kernel.org>
From:   Alexander Lobakin <aleksander.lobakin@intel.com>
In-Reply-To: <20230302224946.never.243-kees@kernel.org>
Content-Type: text/plain; charset="UTF-8"
Content-Transfer-Encoding: 7bit
MIME-Version: 1.0
X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1
X-MS-Exchange-AntiSpam-MessageData-0: =?utf-8?B?blBIZEN3OUZkQUJPejRaREF2ZXNwaXZtQTlyQ3dOYi8zVWZGZkFMMjl1NlRQ?=
 =?utf-8?B?cDdTeFoyY3RaUERYbjFBSTNpLzV2SkRYSFRLdVR4NDFjNjlSQnUxc3BvSWZH?=
 =?utf-8?B?eXVNSDVZekJZWTJHSm9wejBZdGVJZFgwdlFsMHBHbFRxM3MyNWdNRExoVW55?=
 =?utf-8?B?V05FSk9PMDlMT2pFQVFHYWkycEhGZTk5ZUl3V1k5YmRlR21Qb2hxVThteUlC?=
 =?utf-8?B?R2RjdzFOdDFobEdadjhPUXNDWXJHSDJJTFBob0d4VGdtOFJRdThBM2ZTb3hW?=
 =?utf-8?B?dm54MzJkSU5ZSzJ0bFNNZ0ROUnNPNDlZcFVUWWE4bGFqSk5ZZXBWV0JreXJl?=
 =?utf-8?B?djZKeW5sNXAwMHNwNGZNTzRqd3N2RU4zKzg2NDJrR05pYVpQcStETUwzUTYz?=
 =?utf-8?B?Q09Wc0JodHJDZUhSNHg4YXBQempET29VbWJBRml4d2ZzTDkwZnlLejczVmcy?=
 =?utf-8?B?ajJDMUlZbjhkOXBMdGdtbXM0NW1RaEVLcS9ueG54WTRLV0tVU2t1UU42Vmw3?=
 =?utf-8?B?ZFlYMFF0YWRvWEFhNFJpcnc2Tm96RGlHWlAzNEpDNGNYdmN6Q1hocFcrM1RF?=
 =?utf-8?B?QmZ6UjNScW1jTmk1VXVsekNVOTJGdGhPNTFBZ2hRa1JkaDB4eis3OCtDcS9o?=
 =?utf-8?B?aXB2THRTKzhOZ2FvcDlDOUtJUktZY2x3RDlzSzJkUVlBR1NpRnNSQzNIWWpS?=
 =?utf-8?B?Y201SDduRy9tUTlJTFg3V3YzSUJja2RPV0RIKzBUVHowYVQ1Rk5MTmtlT3R5?=
 =?utf-8?B?S1dlUlVMTlo3ZU91UVo4TzVmZlcrQXc5NnROOEM1eTRad1F0RGdFRFNOZWg0?=
 =?utf-8?B?N1U4SCtIVFhJTnc2enBZV2lVRE4wekZRVG81b3c3cm5xL2lsaThkRUZIWis4?=
 =?utf-8?B?K1ZieDcrUGtibU93bXZXano4am1hUytCUk5SSUkxSzhkYm9wRExMTTJ0UmUx?=
 =?utf-8?B?eXBqRGxqQlhrY3JPS0MyWVR3UFZFa0FhaFh4bytkMUtLaDRidkhONzhTdVhH?=
 =?utf-8?B?THJKck5ieDYrOW1seEZDUkxpMnFjVGZlSUV0UFVhTENHZFk5a2RrOW12NVhk?=
 =?utf-8?B?VU1JUXhMSnA5YXVyUmtMVjlsQXpVSDRPNy9GMnN1QzdWdkZMSTN3TWtycmxi?=
 =?utf-8?B?L1MrenhDMldjN2g3d0VDd1hsb0lqWXV5Vm9DRng5NTJLNXo2TXFEWXRLSnB5?=
 =?utf-8?B?dEN2dzBpbG94dFl2K2RjU09nZFdvdzR6UE5ia3UvQ29yQnVSay8wUGRRcFNX?=
 =?utf-8?B?TDRXbEd0TkFZTU9rSE9PRUNHY2lRV3RKVzVzUDZWNHJEYnVBbUpuOWxWQ2ZY?=
 =?utf-8?B?bnpucTdsN1JGOFFJazdKd2JEbnhIeVlBbGlMMWlxYTNCY2pGRTYwUDVDL2xs?=
 =?utf-8?B?Nno2cEgxQjdtMEJNL1Uzd0xxaUJ4V1ptWFVoY2UxSW1jQ0JMWVZ6UHh1aVRn?=
 =?utf-8?B?N2pKT09wdlV3VndBWFRTVTJHK3BWRFZJbEZScUpWdmp3Wm5JSlBwb082ZVRr?=
 =?utf-8?B?VzVUdnlrR2NvQStCVm9PQVc2a0pyQ25oNHlKVlIwcVpxU0RjaGVjZVdFSVM0?=
 =?utf-8?B?b0Jac3VxZDZhOS9oZ2tsZHo4dnA1QW94MDlIS0xJZWIwL1VYQzBmTG5jRjEy?=
 =?utf-8?B?cnNrcTNGci9DdkNTcjNSVE5CU01tRC9pNUVUcmxPU25WSVkzOXFncVk3cGxH?=
 =?utf-8?B?dVZ1VStIajVhWXVnK0MxSklKL3ZSckxmZktUcW5VbWtCaG5nQ3QwYndONmR1?=
 =?utf-8?B?cEU2KzhyK3J0K0xQR09waW9TclZLQVl2M3ZPazUvMkxMcVhHQ2xlYzhpelBQ?=
 =?utf-8?B?R0hHVUJrQWdxbGE3bXBPM1F3TkZVaUZWVFNxUDRmQkxkT2N6b05DU2ljWUtK?=
 =?utf-8?B?d3M4cUd6aGtPRlVSUzV6SndBQlRRUlhoR2VudlE0c2FVc0VCTGJDeTJzdi9T?=
 =?utf-8?B?WnJKTzFJdEU2YTFCQU9Td0J5SmZ6RmgzWUJmY2h6Y0lDSDZybFRWSGRCVHZo?=
 =?utf-8?B?UmtVQnFrZDZ4NzYzVGNnMjArdXRPcktwMUdzUFV4WWtOTWtSZUJNcWx0ZnNI?=
 =?utf-8?B?S1hIR2lCbmV6SnFTK3llaW1EYkZBeHQzTDJQSTJUcitlVDJaZ2FoTG1qLzBJ?=
 =?utf-8?B?UWpRWUJHVTQ4dERxWVdSbHdzUEtBeWVzWkI5WEM5bkZSMGlGbFZkVFdMd1R3?=
 =?utf-8?Q?Jl207H/pQ1UowE+f/ch05sk=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 5dd9f3a2-8aca-491d-39f0-08db1bfadd93
X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB3625.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 03 Mar 2023 15:20:47.9056
 (UTC)
X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted
X-MS-Exchange-CrossTenant-Id: 46c98d88-e344-4ed4-8496-4ed7712e255d
X-MS-Exchange-CrossTenant-MailboxType: HOSTED
X-MS-Exchange-CrossTenant-UserPrincipalName: xXccnoA64RQpCN2JcvnmHcWlaMc3oNYXEZ8PlTLWziZQ21y5tEI17T/qSifpyk7zhMXyszAQWNeddEOrFK2JVLI7frjWs3LGHcoOcClQw0A=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR11MB5361
X-OriginatorOrg: intel.com
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

From: Kees Cook <keescook@chromium.org>
Date: Thu,  2 Mar 2023 14:49:50 -0800

> Under CONFIG_FORTIFY_SOURCE, memcpy() will check the size of destination
> and source buffers. Defining kernel_headers_data as "char" would trip
> this check. Since these addresses are treated as byte arrays, define
> them as arrays (as done everywhere else).

Yet another array-as-one-char, I wonder how many are still here...

> 
> This was seen with:
> 
>   $ cat /sys/kernel/kheaders.tar.xz >> /dev/null
> 
>   detected buffer overflow in memcpy
>   kernel BUG at lib/string_helpers.c:1027!
>   ...
>   RIP: 0010:fortify_panic+0xf/0x20
>   [...]
>   Call Trace:
>    <TASK>
>    ikheaders_read+0x45/0x50 [kheaders]
>    kernfs_fop_read_iter+0x1a4/0x2f0
>   ...
> 
> Reported-by: Jakub Kicinski <kuba@kernel.org>
> Link: https://lore.kernel.org/bpf/20230302112130.6e402a98@kernel.org/
> Tested-by: Jakub Kicinski <kuba@kernel.org>
> Fixes: 43d8ce9d65a5 ("Provide in-kernel headers to make extending kernel easier")
> Cc: Joel Fernandes (Google) <joel@joelfernandes.org>
> Cc: stable@vger.kernel.org
> Signed-off-by: Kees Cook <keescook@chromium.org>

Reviewed-by: Alexander Lobakin <aleksander.lobakin@intel.com>

> ---
>  kernel/kheaders.c | 10 +++++-----
>  1 file changed, 5 insertions(+), 5 deletions(-)
[...]

Thanks,
Olek