Changeset 484186e in rtems-libbsd for ipsec-tools/src/racoon/session.c

Timestamp:

05/22/23 07:36:46 (6 months ago)

Author:

Christian Mauderer <christian.mauderer@…>

Branches:

5-freebsd-12

Parents:

29f9822

git-author:

Christian Mauderer <christian.mauderer@…> (05/22/23 07:36:46)

git-committer:

Christian Mauderer <christian.mauderer@…> (05/31/23 06:25:23)

Message:

ipsec-tools: Fix copying fd_set prior to select

The racoon session code copies an fd_set from one variable into another
prior to calling select. That works well for simple structures.

In libbsd we have to allocate fd_sets instead of using fixed structures
to avoid a problem with file numbers bigger than FD_SETSIZE. The simple
assignment didn't work in that case.

This patch makes sure that a memcpy is used instead.

Close #4914

File:

• ipsec-tools/src/racoon/session.c (modified) (2 diffs)

ipsec-tools/src/racoon/session.c

@@ -210 +210 @@
         FD_ZERO(&preset_mask);
 #else /* __rtems__ */
+        size_t allocated_mask_size = sizeof(fd_set) *
+            howmany(rtems_libio_number_iops, sizeof(fd_set) * 8);
         allocated_preset_mask = calloc(sizeof(fd_set),
             howmany(rtems_libio_number_iops, sizeof(fd_set) * 8));
@@ -343 +345 @@
                 /* schedular can change select() mask, so we reset
                  * the working copy here */
+#ifndef __rtems__
                 active_mask = preset_mask;
+#else /* __rtems__ */
+                memcpy(allocated_active_mask, allocated_preset_mask,
+                    allocated_mask_size);
+#endif /* __rtems__ */
 
                 error = select(nfds + 1, &active_mask, NULL, NULL, timeout);