Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

gcc-15: work around sequence-point warning

The C sequence points are complicated things, and gcc-15 has apparently
added a warning for the case where an object is both used and modified
multiple times within the same sequence point.

That's a great warning.

Or rather, it would be a great warning, except gcc-15 seems to not
really be very exact about it, and doesn't notice that the modification
are to two entirely different members of the same object: the array
counter and the array entries.

So that seems kind of silly.

That said, the code that gcc complains about is unnecessarily
complicated, so moving the array counter update into a separate
statement seems like the most straightforward fix for these warnings:

drivers/net/wireless/intel/iwlwifi/mld/d3.c: In function ‘iwl_mld_set_netdetect_info’:
drivers/net/wireless/intel/iwlwifi/mld/d3.c:1102:66: error: operation on ‘netdetect_info->n_matches’ may be undefined [-Werror=sequence-point]
1102 | netdetect_info->matches[netdetect_info->n_matches++] = match;
| ~~~~~~~~~~~~~~~~~~~~~~~~~^~

drivers/net/wireless/intel/iwlwifi/mld/d3.c:1120:58: error: operation on ‘match->n_channels’ may be undefined [-Werror=sequence-point]
1120 | match->channels[match->n_channels++] =
| ~~~~~~~~~~~~~~~~~^~

side note: the code at that second warning is actively buggy, and only
works on little-endian machines that don't do strict alignment checks.

The code casts an array of integers into an array of unsigned long in
order to use our bitmap iterators. That happens to work fine on any
sane architecture, but it's still wrong.

This does *not* fix that more serious problem. This only splits the two
assignments into two statements and fixes the compiler warning. I need
to get rid of the new warnings in order to be able to actually do any
build testing.

Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>

+6 -3
+6 -3
drivers/net/wireless/intel/iwlwifi/mld/d3.c
··· 1099 1099 if (!match) 1100 1100 return; 1101 1101 1102 - netdetect_info->matches[netdetect_info->n_matches++] = match; 1102 + netdetect_info->matches[netdetect_info->n_matches] = match; 1103 + netdetect_info->n_matches++; 1103 1104 1104 1105 /* We inverted the order of the SSIDs in the scan 1105 1106 * request, so invert the index here. ··· 1117 1116 1118 1117 for_each_set_bit(j, 1119 1118 (unsigned long *)&matches[i].matching_channels[0], 1120 - sizeof(matches[i].matching_channels)) 1121 - match->channels[match->n_channels++] = 1119 + sizeof(matches[i].matching_channels)) { 1120 + match->channels[match->n_channels] = 1122 1121 netdetect_cfg->channels[j]->center_freq; 1122 + match->n_channels++; 1123 + } 1123 1124 } 1124 1125 } 1125 1126