Skip to content

Commit 2b23576

Browse files
edumazetkuba-moo
authored andcommitted
scm: use masked_user_access_begin() in put_cmsg()
Use the greatest and latest uaccess construct to get an optimal code. Before : lea (%r9,%rcx,1),%r10 movabs $<USER_PTR_MAX>,%r11 mov $0xfffffff2,%eax cmp %rcx,%r10 jb ffffffff81cdc312 <put_cmsg+0x152> cmp %r11,%r10 ja ffffffff81cdc312 <put_cmsg+0x152> stac lfence mov %r9,(%rcx) After: movabs $<USER_PTR_MAX>,%r9 cmp %r9,%rax cmova %r9,%rax stac mov %rcx,(%rax) Signed-off-by: Eric Dumazet <edumazet@google.com> Link: https://patch.msgid.link/20250925224914.3590290-1-edumazet@google.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent 3806446 commit 2b23576

1 file changed

Lines changed: 3 additions & 1 deletion

File tree

net/core/scm.c

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,9 @@ int put_cmsg(struct msghdr * msg, int level, int type, int len, void *data)
273273

274274
check_object_size(data, cmlen - sizeof(*cm), true);
275275

276-
if (!user_write_access_begin(cm, cmlen))
276+
if (can_do_masked_user_access())
277+
cm = masked_user_access_begin(cm);
278+
else if (!user_write_access_begin(cm, cmlen))
277279
goto efault;
278280

279281
unsafe_put_user(cmlen, &cm->cmsg_len, efault_end);

0 commit comments

Comments
 (0)