From nobody Tue May 17 17:11:59 2022 X-Original-To: dev-commits-src-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 6FCA51AD9789; Tue, 17 May 2022 17:12:00 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4L2jMz6FDxz3LHB; Tue, 17 May 2022 17:11:59 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652807520; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cAsKhZr+MGkgikPQHRefmJY0MJQ0D4OtQpV9JlH+5yA=; b=RmFNntQnW/LqTeLqfRmJjddJT2QzUVyCcXQFozTBRMQM87tr/z4+9h3XmohYUUfcdumLQp ZRp8Q/rAqc1MXWrZHO0SkuDtgHhPmFXPSDDQqUmwJ+DU4dMRtKVLlnxaI9pXSAV3YwVSsC EodhtUhKmhP1XkjKYgAiRxsCzytwM93HFm+uzLwB9FYauM7gMPm7gr8nD9dRX3M+T4bR7H a0g+gvMsOLtDZDFN/ZI/VYYac6FvTE5wEsTqURyWHBG/ohrSx9uW7YajWDLj6u2kfJLWkH egYCwe2E9OWavbOjHUFeMr+/jci+V6J0Q25kANZHXMGTXM0z53g8VxSUlZvX+g== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 952A2188F1; Tue, 17 May 2022 17:11:59 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24HHBx8w095397; Tue, 17 May 2022 17:11:59 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24HHBxOI095396; Tue, 17 May 2022 17:11:59 GMT (envelope-from git) Date: Tue, 17 May 2022 17:11:59 GMT Message-Id: <202205171711.24HHBxOI095396@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Gleb Smirnoff Subject: git: 6890b588141a - main - sockbuf: improve sbcreatecontrol() List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glebius X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 6890b588141a8298fc8a63700aeeea4ba36ca3f9 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652807520; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=cAsKhZr+MGkgikPQHRefmJY0MJQ0D4OtQpV9JlH+5yA=; b=lZYszRAfdEivYTovqd3dvbanrR8ce7Nf0DevWY1pGlzKGS1Xo9pSLx4yqwaunCl31x7jms 8Q11xJFdjshzl21YPugrXuJrD7UQLIcRkFDdbT0yaKd9ZDCK9vjszHer+okb5r7iK4ZEPy NlJsQNbS0hR8kp73+TD5LbbDo/Wdt6TS0dtCxG3RGk4m1TU0Bh7hiuohQoigD+WK8ARKII ZxNkFj+ZP4JvVrcBRQw1i4KfmHMBdIS/uYNjpNZnRZztPcFBCqh5JIDBTiw8h9xembixEx EGOtMByFyJHuMVF+EXTsu9ykYzPNZcqBwlY1Ti/WDm58loNegb3v+D4m3aLaGg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652807520; a=rsa-sha256; cv=none; b=gtt9tV9bJNTIu11mq47dkIU/XlyC4xBhv8famPnLce+obNtfYD5oL6IjLhSWZ0exPNjNEk vTtI3OOybaoataxFhWXr2U4piliU299KccoLmrSAFrunOYy16aXTjI81qZMcSizttHrGo+ ppv7WZyi3Jp9Ez60jkCZkS0LictC+k9X34jn2t6hLgSspaBXbgrMD3hgaT6g8FsAcgxHMK Khl6T/AYMmrQb1Yfm12RkGB894gPBMVNGOF3T+tpu3LgPDnH6cEhNA8N7fOBrPNGSuJonV 4a2EsiLTlfk1a8YrkrM+CeN1B9rUSW38WZPagA4FoMUMUOo1XjS+sRzJIDGIDA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glebius: URL: https://cgit.FreeBSD.org/src/commit/?id=6890b588141a8298fc8a63700aeeea4ba36ca3f9 commit 6890b588141a8298fc8a63700aeeea4ba36ca3f9 Author: Gleb Smirnoff AuthorDate: 2022-05-17 17:10:42 +0000 Commit: Gleb Smirnoff CommitDate: 2022-05-17 17:10:42 +0000 sockbuf: improve sbcreatecontrol() o Constify memory pointer. Make length unsigned. o Make it never fail with M_WAITOK and assert that length is sane. --- sys/kern/uipc_sockbuf.c | 24 +++++++++++++++--------- sys/netinet6/ip6_input.c | 4 ++-- sys/sys/sockbuf.h | 3 ++- 3 files changed, 19 insertions(+), 12 deletions(-) diff --git a/sys/kern/uipc_sockbuf.c b/sys/kern/uipc_sockbuf.c index 884562510e61..e3a9f92d8da0 100644 --- a/sys/kern/uipc_sockbuf.c +++ b/sys/kern/uipc_sockbuf.c @@ -1760,29 +1760,35 @@ sbdroprecord(struct sockbuf *sb) * type for presentation on a socket buffer. */ struct mbuf * -sbcreatecontrol(void *p, int size, int type, int level, int wait) +sbcreatecontrol(const void *p, u_int size, int type, int level, int wait) { struct cmsghdr *cp; struct mbuf *m; MBUF_CHECKSLEEP(wait); - if (CMSG_SPACE((u_int)size) > MCLBYTES) - return ((struct mbuf *) NULL); - if (CMSG_SPACE((u_int)size) > MLEN) + + if (wait == M_NOWAIT) { + if (CMSG_SPACE(size) > MCLBYTES) + return (NULL); + } else + KASSERT(size <= MCLBYTES, ("%s: passed size %u > MCLBYTES", + __func__, size)); + + if (CMSG_SPACE(size) > MLEN) m = m_getcl(wait, MT_CONTROL, 0); else m = m_get(wait, MT_CONTROL); if (m == NULL) - return ((struct mbuf *) NULL); - cp = mtod(m, struct cmsghdr *); - m->m_len = 0; - KASSERT(CMSG_SPACE((u_int)size) <= M_TRAILINGSPACE(m), + return (NULL); + + KASSERT(CMSG_SPACE(size) <= M_TRAILINGSPACE(m), ("sbcreatecontrol: short mbuf")); /* * Don't leave the padding between the msg header and the * cmsg data and the padding after the cmsg data un-initialized. */ - bzero(cp, CMSG_SPACE((u_int)size)); + cp = mtod(m, struct cmsghdr *); + bzero(cp, CMSG_SPACE(size)); if (p != NULL) (void)memcpy(CMSG_DATA(cp), p, size); m->m_len = CMSG_SPACE(size); diff --git a/sys/netinet6/ip6_input.c b/sys/netinet6/ip6_input.c index 9835dc495f09..a9bc05f0c19c 100644 --- a/sys/netinet6/ip6_input.c +++ b/sys/netinet6/ip6_input.c @@ -1413,7 +1413,7 @@ ip6_savecontrol(struct inpcb *inp, struct mbuf *m, struct mbuf **mp) */ if (ip6->ip6_nxt == IPPROTO_HOPOPTS) { struct ip6_hbh *hbh; - int hbhlen; + u_int hbhlen; hbh = (struct ip6_hbh *)(ip6 + 1); hbhlen = (hbh->ip6h_len + 1) << 3; @@ -1445,7 +1445,7 @@ ip6_savecontrol(struct inpcb *inp, struct mbuf *m, struct mbuf **mp) */ while (1) { /* is explicit loop prevention necessary? */ struct ip6_ext *ip6e = NULL; - int elen; + u_int elen; /* * if it is not an extension header, don't try to diff --git a/sys/sys/sockbuf.h b/sys/sys/sockbuf.h index efa87b1f2378..753ebd1fbf35 100644 --- a/sys/sys/sockbuf.h +++ b/sys/sys/sockbuf.h @@ -158,7 +158,8 @@ void sbappendrecord(struct sockbuf *sb, struct mbuf *m0); void sbappendrecord_locked(struct sockbuf *sb, struct mbuf *m0); void sbcompress(struct sockbuf *sb, struct mbuf *m, struct mbuf *n); struct mbuf * - sbcreatecontrol(void *p, int size, int type, int level, int wait); + sbcreatecontrol(const void *p, u_int size, int type, int level, + int wait); void sbdestroy(struct socket *, sb_which); void sbdrop(struct sockbuf *sb, int len); void sbdrop_locked(struct sockbuf *sb, int len);