git: fd94571ccf0c - main - rawip: Take the inpcb lock when appropriate in rip_ctloutput()

[Mark Johnston]

The branch main has been updated by markj:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=fd94571ccf0c9c6521063c08a72a760873e87897

commit fd94571ccf0c9c6521063c08a72a760873e87897
Author:     Mark Johnston <ma...@freebsd.org>
AuthorDate: 2025-01-07 02:20:05 +0000
Commit:     Mark Johnston <ma...@freebsd.org>
CommitDate: 2025-01-07 02:20:05 +0000

    rawip: Take the inpcb lock when appropriate in rip_ctloutput()
    
    Reviewed by:    glebius
    MFC after:      1 week
    Sponsored by:   Klara, Inc.
    Sponsored by:   Stormshield
    Differential Revision:  https://reviews.freebsd.org/D48344
---
 sys/netinet/raw_ip.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/sys/netinet/raw_ip.c b/sys/netinet/raw_ip.c
index a6bef1c7e275..3a0b9f632fb4 100644
--- a/sys/netinet/raw_ip.c
+++ b/sys/netinet/raw_ip.c
@@ -625,8 +625,6 @@ rip_send(struct socket *so, int pruflags, struct mbuf *m, 
struct sockaddr *nam,
  *
  * When adding new socket options here, make sure to add access control
  * checks here as necessary.
- *
- * XXX-BZ inp locking?
  */
 int
 rip_ctloutput(struct socket *so, struct sockopt *sopt)
@@ -637,7 +635,9 @@ rip_ctloutput(struct socket *so, struct sockopt *sopt)
        if (sopt->sopt_level != IPPROTO_IP) {
                if ((sopt->sopt_level == SOL_SOCKET) &&
                    (sopt->sopt_name == SO_SETFIB)) {
+                       INP_WLOCK(inp);
                        inp->inp_inc.inc_fibnum = so->so_fibnum;
+                       INP_WUNLOCK(inp);
                        return (0);
                }
                return (EINVAL);
@@ -707,10 +707,12 @@ rip_ctloutput(struct socket *so, struct sockopt *sopt)
                                            sizeof optval);
                        if (error)
                                break;
+                       INP_WLOCK(inp);
                        if (optval)
                                inp->inp_flags |= INP_HDRINCL;
                        else
                                inp->inp_flags &= ~INP_HDRINCL;
+                       INP_WUNLOCK(inp);
                        break;
 
                case IP_FW3:    /* generic ipfw v.3 functions */