mirrors/linux
2
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git synced 2026-08-31 08:15:07 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge tag 'dma-mapping-7.3-2026-08-27' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux

Browse Source 
Pull dma-mapping fix from Marek Szyprowski:

 - integer overflow fix for kernel cmdline parser for DMA contiguous
   initialization code (Alexander Graf)

* tag 'dma-mapping-7.3-2026-08-27' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux:
  dma-contiguous: fix truncation of numa_cma / cma_pernuma sizes >= 2G
This commit is contained in:
Linus Torvalds
2026-08-27 12:14:19 -07:00
parent f7e3f4d9f4 1476cca098
commit 7cec13314d
1 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
kernel/dma/contiguous.c
View File

@@ -140,21 +140,22 @@ static bool numa_cma_configured __initdata;
static int __init early_numa_cma(char *p)
{
int nid, count = 0;
unsigned long tmp;
unsigned long node;
phys_addr_t size;
char *s = p;
while (*s) {
if (sscanf(s, "%lu%n", &tmp, &count) != 1)
if (sscanf(s, "%lu%n", &node, &count) != 1)
break;
if (s[count] == ':') {
if (tmp >= MAX_NUMNODES)
if (node >= MAX_NUMNODES)
break;
nid = array_index_nospec(tmp, MAX_NUMNODES);
nid = array_index_nospec(node, MAX_NUMNODES);
s += count + 1;
tmp = memparse(s, &s);
numa_cma_size[nid] = tmp;
size = memparse(s, &s);
numa_cma_size[nid] = size;
if (*s == ',')
s++;
@@ -207,9 +208,10 @@ static void __init dma_numa_cma_reserve(void)
pernuma_size_bytes = cma_get_size(dma_contiguous_default_area);
for_each_node(nid) {
int size, ret;
phys_addr_t size;
char name[CMA_MAX_NAME];
struct cma **cma;
int ret;
if (!node_online(nid)) {
if (pernuma_size_bytes || numa_cma_size[nid])