signer: Fix a usize vs u32 comparison

Blockstream · Nov 9, 2023 · 059f011 · 059f011
1 parent 24db122
commit 059f011
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 11 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -129,6 +129,7 @@ jobs:
         # inconsistent syntax between shell and powershell.
         shell: bash
         run: |
+          cd libs
           # Parse out what we just built and upload it to the Github Release™
           echo "paths<<EOF" >> "$GITHUB_OUTPUT"
           jq --raw-output ".artifacts[]?.path | select( . != null )" dist-manifest.json >> "$GITHUB_OUTPUT"

diff --git a/libs/gl-signerproxy/src/passfd.rs b/libs/gl-signerproxy/src/passfd.rs
@@ -1,7 +1,7 @@
 use libc::{self, c_int, c_uchar, c_void, msghdr};
-use std::mem;
 use log::trace;
 use std::io::{Error, ErrorKind};
+use std::mem;
 use std::os::unix::io::RawFd;
 
 pub trait SyncFdPassingExt {
@@ -80,23 +80,24 @@ impl SyncFdPassingExt for RawFd {
                 0 => Err(Error::new(ErrorKind::UnexpectedEof, "0 bytes read")),
                 rv if rv < 0 => Err(Error::last_os_error()),
                 rv if rv == mem::size_of::<c_uchar>() as isize => {
-                    let hdr: *mut libc::cmsghdr =
-                        if msg.msg_controllen >= mem::size_of::<libc::cmsghdr>() as _ {
-                            msg.msg_control as *mut libc::cmsghdr
-                        } else {
-                            return Err(Error::new(
-                                ErrorKind::InvalidData,
-                                "bad control msg (header)",
-                            ));
-                        };
+                    let hdr: *mut libc::cmsghdr = if msg.msg_controllen as usize
+                        >= mem::size_of::<libc::cmsghdr>() as usize
+                    {
+                        msg.msg_control as *mut libc::cmsghdr
+                    } else {
+                        return Err(Error::new(
+                            ErrorKind::InvalidData,
+                            "bad control msg (header)",
+                        ));
+                    };
                     if (*hdr).cmsg_level != libc::SOL_SOCKET || (*hdr).cmsg_type != libc::SCM_RIGHTS
                     {
                         return Err(Error::new(
                             ErrorKind::InvalidData,
                             "bad control msg (level)",
                         ));
                     }
-                    if msg.msg_controllen
+                    if msg.msg_controllen as usize
                         != libc::CMSG_SPACE(mem::size_of::<c_int>() as u32) as usize
                     {
                         return Err(Error::new(ErrorKind::InvalidData, "bad control msg (len)"));