diff options
| author |   Andrew Morton <akpm@linux-foundation.org> | 2023-01-11 14:01:55 -0800 |
|---|---|---|
| committer | Andrew Morton <akpm@linux-foundation.org> | 2023-01-11 14:01:55 -0800 |
| commit | 18e6340365eab44339a0aadab76c3d26a2406a72 (patch) | |
| tree | 0322e1e0507b32710b0fbb44dd826dc51558b3de /lib | |
| parent | selftests/filesystems: grant executable permission to run_fat_tests.sh (diff) | |
| parent | Linux 6.2-rc3 (diff) | |
| download | wireguard-linux-18e6340365eab44339a0aadab76c3d26a2406a72.tar.xz wireguard-linux-18e6340365eab44339a0aadab76c3d26a2406a72.zip | |
Merge branch 'master' into mm-nonmm-stable
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/kunit/string-stream.c | 4 | ||||
| -rw-r--r-- | lib/scatterlist.c | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/kunit/string-stream.c b/lib/kunit/string-stream.c index f5f51166d8c2..cc32743c1171 100644 --- a/lib/kunit/string-stream.c +++ b/lib/kunit/string-stream.c @@ -23,8 +23,10 @@ static struct string_stream_fragment *alloc_string_stream_fragment( return ERR_PTR(-ENOMEM); frag->fragment = kunit_kmalloc(test, len, gfp); - if (!frag->fragment) + if (!frag->fragment) { + kunit_kfree(test, frag); return ERR_PTR(-ENOMEM); + } return frag; } diff --git a/lib/scatterlist.c b/lib/scatterlist.c index a0ad2a7959b5..f72aa50c6654 100644 --- a/lib/scatterlist.c +++ b/lib/scatterlist.c @@ -476,7 +476,7 @@ int sg_alloc_append_table_from_pages(struct sg_append_table *sgt_append, /* Merge contiguous pages into the last SG */ prv_len = sgt_append->prv->length; last_pg = sg_page(sgt_append->prv); - while (n_pages && pages_are_mergeable(last_pg, pages[0])) { + while (n_pages && pages_are_mergeable(pages[0], last_pg)) { if (sgt_append->prv->length + PAGE_SIZE > max_segment) break; sgt_append->prv->length += PAGE_SIZE; |