Message-ID: <d0fe6542-b786-09b6-0657-8c47fb19e0fb@intel.com>
Date:   Mon, 6 Mar 2023 11:39:00 +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>
 <89e3ecb6-0e1a-3d86-cb05-cbb034c68dc4@intel.com>
 <64025a3a.170a0220.dba96.3fcf@mx.google.com>
From:   Alexander Lobakin <aleksander.lobakin@intel.com>
In-Reply-To: <64025a3a.170a0220.dba96.3fcf@mx.google.com>
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?aTdJYnJnWWhaYjR0SkZaUGNVbktDQkppc2t1K2dxS0JKSHhzajZyU0pWOFRt?=
 =?utf-8?B?aDFTMENSSzdPcDFweUNWMnIrc1ZYaDJGalpIUXBVaFBrQWM5QWd4SHFYeUw4?=
 =?utf-8?B?bWNqeGhqU1R5MlUySUNVWnNQN1pHYzJDbGhnTkhEWS9COVRxL3YzZmw0OE5x?=
 =?utf-8?B?ZU5QTnYvTWxFakhxQ0ZhVjV5b3pIdWsxb1F2VlNEWC9RcXdyaGZ0VFJac3Bx?=
 =?utf-8?B?ZjFmb3MxajNlZUxPc1p2aFpWdGpkNHRMa3N2VnBLbk5mYXBPdTNJVGMvdHZB?=
 =?utf-8?B?QkZaRXRuNVBDeHo1WGhwVDB2b0FYcFR1eGpFSHhaRzJvY3JyZ1RENlhBZXdH?=
 =?utf-8?B?ZkZic3R3MVRRUFZNMVo3L3dLaTBEOWdObS84NHlDYWt1ZmdyMEREVEpycTgw?=
 =?utf-8?B?TGJiYW03aW11bHJxaWtYWWlYREFaVWJ2NUNtVWVsWGgwMDJXNTQ5TjVMUGdl?=
 =?utf-8?B?UDBQNm5VcVpJRm5SRUhxc0ladFczVlRpR210LzVTZWZsOEVseE55VkN4eHF6?=
 =?utf-8?B?NVBTdG5hZHpaNU9PK1RTdlRNampLWldLdGZGKzYwamRETXo4RjNUSldkc0lW?=
 =?utf-8?B?ekRtaktxeVF1b2JyWDh6aCtLM015T0hEZzk4U3F1T0gzSEZBOGtWODMyb0Fa?=
 =?utf-8?B?UEV1MWRIRUZrVytKV3d3czZlMURVZFRvRzJtbDhnWlM0aGpwb09uanN6Ujhj?=
 =?utf-8?B?ZFFza0F1Y2txcXRKaUdrbHl6V1Bsa3dRbEp5bUVvdFRMMjlZL0RXWTBaWmE0?=
 =?utf-8?B?UDV5bFd4cEx4akNxQ2tobHJEZnNpSkx1dWVKcFNJUmd3c3B4WkRBZmtMSFVz?=
 =?utf-8?B?RnlkQlVOc2t4YS8xU3hHZFVmZE1iaUxSL2Q0REFac202VnZHVnBFcmNWeEFv?=
 =?utf-8?B?SWFrTHhmbHZBVDNOQTUrMWhwT2VlQ1RjRHFJTDJSZTNnMlpTaDNBRzBSVTBV?=
 =?utf-8?B?NmZBN3llZ1RzVEZ0TitUeVFITUdKTVJBbDVzUG4yZ29EQ29UM3lNTVRWcXF5?=
 =?utf-8?B?cWEzZ1lRczc5aCtmQ1VRRFJFL3prcmpnOUE0dWxjME9FOGhmMnUwU2xiRGtu?=
 =?utf-8?B?eEY4eW13ZWNOTG5VMVZmRWNqTy9xN2RQVE5qTThoR1ZGSW9vZmlqVVhTV0d3?=
 =?utf-8?B?d2NsNlFicW5zd0xaOHNYbDkxMHRCckluSi9jeWQ3MFRXbkVDYjdVcktLOGE3?=
 =?utf-8?B?bW5HTGJNM1p1TjhSelFzY0ZpOUljMzlaVC9wMjQ5ZGlDMGJHUWxrMHVRa3RX?=
 =?utf-8?B?amo0RDBsckxDbG5uMTJ0cGRsSzFnUVBMaVNYZXlKcndqZWhsT2llRVVaNFp4?=
 =?utf-8?B?R3JLamVGKy9ZS3FKS1pjaFRVTS9oZ0ZIUkhhZHYwb2xBcjh1S2dkOGErRFBr?=
 =?utf-8?B?d0NDNi81d0lCWGF6ak5UNC9WUEJKSjlqWkRyTDJVZE9GQmYrbUdCdWNISG5i?=
 =?utf-8?B?cU9KbXV1cDdySEh5dTlTOUFOTldVUlRzUFpwSmV1dFlRTVpQa1JsUkJNbkhS?=
 =?utf-8?B?TnRSUzZmNzN1ckFVeFNHTWZSQVlQWTNWNlJIeUwvQWQwWUd4MGVkTW1veko0?=
 =?utf-8?B?RlU4bytDaUNpaW4xTS9iV0IxL1JDQ3V6Mzd0Q1FkVjdySHdMV1c1UTdDZmc4?=
 =?utf-8?B?RXRBdU5wc3JJNmxqOHNOc1BMaFJvejNKdHdyU04zYTNZSW1DakhLa0JrUnly?=
 =?utf-8?B?TU1KaTFrMkozb1FPbFM2aUJ2NGN6Z0doM1hNcDdwLzFsa2lRbXl2VW55ekl5?=
 =?utf-8?B?amNuUWtWRkh4S2RxK0xWWGViTkZLRkpWM1Rtd0o3Vk1xSGNWN0FSNmNWRG5a?=
 =?utf-8?B?TnFWL29DSG1xWktqOG9zZHJSRDYwYUpDMTZoYkhrdHNMejUyNjlqbEtmRDVT?=
 =?utf-8?B?OFpMcXNHbFlvVWZnUFVBNVE4ZzVsMUI5Mjg0ZzJJTCs1SmU2UmpKL2lHZHIx?=
 =?utf-8?B?RTBPR05EODUvSGNiQ0d6d0U3UWc0d2N6eFdMcEljWjM0NEplN21kN1N5RkpD?=
 =?utf-8?B?cnN5WWdwQUtnU2NEbENrMlBOZGEyYXBOV0xOWjVvajN4VmZFTE1rbWNPL2R0?=
 =?utf-8?B?NWcxY0ZCZGxvS3locXdmbExycUx0N2MxV0sxTzRPeTZRaDVTRTZSOU1NY1RI?=
 =?utf-8?B?V0ZVRzFuQmRucnNuUlhJL3J5amQ2TlppbDBMcy83a013aWdqcmFzb0lXNERh?=
 =?utf-8?Q?eKkNgLtWdfU4ns1Fo3coYP4=3D?=
X-MS-Exchange-CrossTenant-Network-Message-Id: 1564dd4f-d746-4c36-5497-08db1e2f2f27
X-MS-Exchange-CrossTenant-AuthSource: DM6PR11MB3625.namprd11.prod.outlook.com
X-MS-Exchange-CrossTenant-AuthAs: Internal
X-MS-Exchange-CrossTenant-OriginalArrivalTime: 06 Mar 2023 10:40:20.8491
 (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: 1lH85POuazNHIThF4gGIORcFpQGPBueE+tZ/1mIRScpz93C3tO7V30JaLr4KmKAMoXzNNeR6qCjOcdzeK+EhRVDaZYBRcEobV6V7+cZDYw8=
X-MS-Exchange-Transport-CrossTenantHeadersStamped: PH8PR11MB8108
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: Fri, 3 Mar 2023 12:36:09 -0800

> On Fri, Mar 03, 2023 at 04:19:51PM +0100, Alexander Lobakin wrote:
>> 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...
> 
> Yeah, good point. They do tend to stand out; we could find them:
> 
> $ git grep 'extern char [^\*\[\( ]*;'
> arch/alpha/boot/bootp.c:extern char _end;
> arch/alpha/boot/bootpz.c:extern char _end;
> arch/alpha/boot/main.c: extern char _end;
> arch/arm/mach-rockchip/core.h:extern char rockchip_secondary_trampoline;
> arch/arm/mach-rockchip/core.h:extern char rockchip_secondary_trampoline_end;
> arch/arm/mach-zynq/common.h:extern char zynq_secondary_trampoline;
> arch/arm/mach-zynq/common.h:extern char zynq_secondary_trampoline_jump;
> arch/arm/mach-zynq/common.h:extern char zynq_secondary_trampoline_end;
> arch/hexagon/include/uapi/asm/setup.h:extern char external_cmdline_buffer;
> arch/ia64/include/asm/smp.h:extern char no_int_routing;
> arch/ia64/kernel/process.c:     extern char ia64_ret_from_clone;
> arch/mips/dec/prom/memory.c:    extern char genexcept_early;
> arch/mips/kernel/traps.c:       extern char except_vec3_generic;
> arch/mips/kernel/traps.c:       extern char except_vec4;
> arch/mips/kernel/traps.c:       extern char except_vec3_r4000;
> arch/mips/mm/c-octeon.c:        extern char except_vec2_octeon;
> arch/parisc/boot/compressed/misc.c:extern char output_len;
> arch/parisc/boot/compressed/misc.c:extern char _startcode_end;
> arch/powerpc/include/asm/smp.h:extern char __secondary_hold;
> arch/s390/include/asm/kvm_host.h:extern char sie_exit;
> arch/sh/boards/mach-ap325rxa/setup.c:extern char ap325rxa_sdram_enter_start;
> arch/sh/boards/mach-ap325rxa/setup.c:extern char ap325rxa_sdram_enter_end;
> arch/sh/boards/mach-ap325rxa/setup.c:extern char ap325rxa_sdram_leave_start;
> arch/sh/boards/mach-ap325rxa/setup.c:extern char ap325rxa_sdram_leave_end;
> arch/sh/boards/mach-ecovec24/setup.c:extern char ecovec24_sdram_enter_start;
> arch/sh/boards/mach-ecovec24/setup.c:extern char ecovec24_sdram_enter_end;
> arch/sh/boards/mach-ecovec24/setup.c:extern char ecovec24_sdram_leave_start;
> arch/sh/boards/mach-ecovec24/setup.c:extern char ecovec24_sdram_leave_end;
> arch/sh/boards/mach-kfr2r09/setup.c:extern char kfr2r09_sdram_enter_start;
> arch/sh/boards/mach-kfr2r09/setup.c:extern char kfr2r09_sdram_enter_end;
> arch/sh/boards/mach-kfr2r09/setup.c:extern char kfr2r09_sdram_leave_start;
> arch/sh/boards/mach-kfr2r09/setup.c:extern char kfr2r09_sdram_leave_end;
> arch/sh/boards/mach-migor/setup.c:extern char migor_sdram_enter_start;
> arch/sh/boards/mach-migor/setup.c:extern char migor_sdram_enter_end;
> arch/sh/boards/mach-migor/setup.c:extern char migor_sdram_leave_start;
> arch/sh/boards/mach-migor/setup.c:extern char migor_sdram_leave_end;
> arch/sh/boards/mach-se/7724/setup.c:extern char ms7724se_sdram_enter_start;
> arch/sh/boards/mach-se/7724/setup.c:extern char ms7724se_sdram_enter_end;
> arch/sh/boards/mach-se/7724/setup.c:extern char ms7724se_sdram_leave_start;
> arch/sh/boards/mach-se/7724/setup.c:extern char ms7724se_sdram_leave_end;
> arch/sh/kernel/cpu/shmobile/pm.c:extern char sh_mobile_sleep_enter_start;
> arch/sh/kernel/cpu/shmobile/pm.c:extern char sh_mobile_sleep_enter_end;
> arch/sh/kernel/cpu/shmobile/pm.c:extern char sh_mobile_sleep_resume_start;
> arch/sh/kernel/cpu/shmobile/pm.c:extern char sh_mobile_sleep_resume_end;
> arch/x86/entry/vsyscall/vsyscall_64.c:  extern char __vsyscall_page;
> arch/x86/include/asm/vvar.h:extern char __vvar_page;
> kernel/configs.c:extern char kernel_config_data;
> kernel/configs.c:extern char kernel_config_data_end;
> net/bpfilter/bpfilter_kern.c:extern char bpfilter_umh_start;
> net/bpfilter/bpfilter_kern.c:extern char bpfilter_umh_end;
> samples/bpf/task_fd_query_user.c:       extern char __executable_start;
> tools/testing/selftests/kvm/lib/aarch64/processor.c:    extern char vectors;
> tools/testing/selftests/x86/test_syscall_vdso.c:extern char int80;
> 
> Of those, it looks like only a handful might trip FORTIFY:
> 
> $ for i in $(git grep 'extern char [^\*\[\( ]*;' | grep -v boot/ | awk -F' ' '{print $NF}' | cut -d';' -f1); do git grep -E '(strcpy|memcpy|memset).*'"$i",; done
> arch/arm/mach-rockchip/platsmp.c:       memcpy_toio(sram_base_addr, &rockchip_secondary_trampoline, trampoline_sz);
> arch/arm/mach-zynq/platsmp.c:                   memcpy_toio(zero, &zynq_secondary_trampoline,
> arch/mips/dec/prom/memory.c:    memcpy((void *)(CKSEG0 + 0x80), &genexcept_early, 0x80);
> arch/sh/kernel/cpu/shmobile/pm.c:       memcpy(vp, &sh_mobile_sleep_enter_start, n);
> arch/sh/kernel/cpu/shmobile/pm.c:       memcpy(vp, &sh_mobile_sleep_resume_start, n);
> arch/arm64/mm/trans_pgd.c:      memcpy(hyp_stub, &trans_pgd_stub_vectors, ARM64_VECTOR_TABLE_LEN);
> 
> 
This list looks much better than the first one :D

I remember I caught a couple fortify bugs due to such array declaration
on MIPS only when testing with `KCFLAGS=-O3`. The thing was that a
pointer to such array-not-array was passed as a function argument and
that function wasn't inlined on -O2. So I sometimes use this optlevel
for sanity-checking the code :P

Thanks,
Olek