Update validate_owner callsite

febo · febo · commit f82f9393d052 · 2025-07-09T10:54:46.000+01:00
diff --git a/p-token/src/processor/close_account.rs b/p-token/src/processor/close_account.rs
@@ -37,7 +37,8 @@ pub fn process_close_account(accounts: &[AccountInfo]) -> ProgramResult {
             .unwrap_or(&source_account.owner);
 
         if !source_account.is_owned_by_system_program_or_incinerator() {
-            validate_owner(authority, authority_info, remaining)?;
+            // SAFETY: `authority_info` is not currently borrowed.
+            unsafe { validate_owner(authority, authority_info, remaining)? };
         } else if destination_account_info.key() != &INCINERATOR_ID {
             return Err(ProgramError::InvalidAccountData);
         }
diff --git a/p-token/src/processor/revoke.rs b/p-token/src/processor/revoke.rs
@@ -28,7 +28,8 @@ pub fn process_revoke(accounts: &[AccountInfo]) -> ProgramResult {
         return Err(TokenError::AccountFrozen.into());
     }
 
-    validate_owner(&source_account.owner, owner_info, remaining)?;
+    // SAFETY: `owner_info` is not currently borrowed.
+    unsafe { validate_owner(&source_account.owner, owner_info, remaining)? }
 
     source_account.clear_delegate();
     source_account.set_delegated_amount(0);
diff --git a/p-token/src/processor/set_authority.rs b/p-token/src/processor/set_authority.rs
@@ -50,7 +50,8 @@ pub fn process_set_authority(accounts: &[AccountInfo], instruction_data: &[u8])
 
         match authority_type {
             AuthorityType::AccountOwner => {
-                validate_owner(&account.owner, authority_info, remaining)?;
+                // SAFETY: `authority_info` is not currently borrowed.
+                unsafe { validate_owner(&account.owner, authority_info, remaining)? };
 
                 if let Some(authority) = new_authority {
                     account.owner = *authority;
@@ -67,7 +68,8 @@ pub fn process_set_authority(accounts: &[AccountInfo], instruction_data: &[u8])
             }
             AuthorityType::CloseAccount => {
                 let authority = account.close_authority().unwrap_or(&account.owner);
-                validate_owner(authority, authority_info, remaining)?;
+                // SAFETY: `authority_info` is not currently borrowed.
+                unsafe { validate_owner(authority, authority_info, remaining)? };
 
                 if let Some(authority) = new_authority {
                     account.set_close_authority(authority);
@@ -90,7 +92,8 @@ pub fn process_set_authority(accounts: &[AccountInfo], instruction_data: &[u8])
                 // mint_authority.
                 let mint_authority = mint.mint_authority().ok_or(TokenError::FixedSupply)?;
 
-                validate_owner(mint_authority, authority_info, remaining)?;
+                // SAFETY: `authority_info` is not currently borrowed.
+                unsafe { validate_owner(mint_authority, authority_info, remaining)? };
 
                 if let Some(authority) = new_authority {
                     mint.set_mint_authority(authority);
@@ -105,7 +108,8 @@ pub fn process_set_authority(accounts: &[AccountInfo], instruction_data: &[u8])
                     .freeze_authority()
                     .ok_or(TokenError::MintCannotFreeze)?;
 
-                validate_owner(freeze_authority, authority_info, remaining)?;
+                // SAFETY: `authority_info` is not currently borrowed.
+                unsafe { validate_owner(freeze_authority, authority_info, remaining)? };
 
                 if let Some(authority) = new_authority {
                     mint.set_freeze_authority(authority);
diff --git a/p-token/src/processor/shared/approve.rs b/p-token/src/processor/shared/approve.rs
@@ -69,7 +69,8 @@ pub fn process_approve(
         }
     }
 
-    validate_owner(&source_account.owner, owner_info, remaining)?;
+    // SAFETY: `owner_info` is not currently borrowed.
+    unsafe { validate_owner(&source_account.owner, owner_info, remaining)? };
 
     // Sets the delegate and delegated amount.
 
diff --git a/p-token/src/processor/shared/burn.rs b/p-token/src/processor/shared/burn.rs
@@ -54,7 +54,8 @@ pub fn process_burn(
     if !source_account.is_owned_by_system_program_or_incinerator() {
         match source_account.delegate() {
             Some(delegate) if authority_info.key() == delegate => {
-                validate_owner(delegate, authority_info, remaining)?;
+                // SAFETY: `authority_info` is not currently borrowed.
+                unsafe { validate_owner(delegate, authority_info, remaining)? };
 
                 let delegated_amount = source_account
                     .delegated_amount()
@@ -67,7 +68,8 @@ pub fn process_burn(
                 }
             }
             _ => {
-                validate_owner(&source_account.owner, authority_info, remaining)?;
+                // SAFETY: `authority_info` is not currently borrowed.
+                unsafe { validate_owner(&source_account.owner, authority_info, remaining)? };
             }
         }
     }
diff --git a/p-token/src/processor/shared/mint_to.rs b/p-token/src/processor/shared/mint_to.rs
@@ -48,7 +48,8 @@ pub fn process_mint_to(
     }
 
     match mint.mint_authority() {
-        Some(mint_authority) => validate_owner(mint_authority, owner_info, remaining)?,
+        // SAFETY: `owner_info` is not currently borrowed.
+        Some(mint_authority) => unsafe { validate_owner(mint_authority, owner_info, remaining)? },
         None => return Err(TokenError::FixedSupply.into()),
     }
 
diff --git a/p-token/src/processor/shared/toggle_account_state.rs b/p-token/src/processor/shared/toggle_account_state.rs
@@ -35,7 +35,8 @@ pub fn process_toggle_account_state(accounts: &[AccountInfo], freeze: bool) -> P
     let mint = unsafe { load::<Mint>(mint_info.borrow_data_unchecked())? };
 
     match mint.freeze_authority() {
-        Some(authority) => validate_owner(authority, authority_info, remaining),
+        // SAFETY: `authority_info` is not currently borrowed.
+        Some(authority) => unsafe { validate_owner(authority, authority_info, remaining) },
         None => Err(TokenError::MintCannotFreeze.into()),
     }?;
 
diff --git a/p-token/src/processor/shared/transfer.rs b/p-token/src/processor/shared/transfer.rs
@@ -127,7 +127,8 @@ pub fn process_transfer(
     // Validates the authority (delegate or owner).
 
     if source_account.delegate() == Some(authority_info.key()) {
-        validate_owner(authority_info.key(), authority_info, remaining)?;
+        // SAFETY: `authority_info` is not currently borrowed.
+        unsafe { validate_owner(authority_info.key(), authority_info, remaining)? };
 
         let delegated_amount = source_account
             .delegated_amount()
@@ -142,7 +143,8 @@ pub fn process_transfer(
             }
         }
     } else {
-        validate_owner(&source_account.owner, authority_info, remaining)?;
+        // SAFETY: `authority_info` is not currently borrowed.
+        unsafe { validate_owner(&source_account.owner, authority_info, remaining)? };
     }
 
     if self_transfer || amount == 0 {
diff --git a/p-token/src/processor/withdraw_excess_lamports.rs b/p-token/src/processor/withdraw_excess_lamports.rs
@@ -30,15 +30,17 @@ pub fn process_withdraw_excess_lamports(accounts: &[AccountInfo]) -> ProgramResu
                 return Err(TokenError::NativeNotSupported.into());
             }
 
-            validate_owner(&account.owner, authority_info, remaining)?;
+            // SAFETY: `authority_info` is not currently borrowed.
+            unsafe { validate_owner(&account.owner, authority_info, remaining)? };
         }
         Mint::LEN => {
             // SAFETY: `source_data` has the same length as `Mint`.
             let mint = unsafe { load::<Mint>(source_data)? };
 
             match mint.mint_authority() {
                 Some(mint_authority) => {
-                    validate_owner(mint_authority, authority_info, remaining)?;
+                    // SAFETY: `authority_info` is not currently borrowed.
+                    unsafe { validate_owner(mint_authority, authority_info, remaining)? };
                 }
                 None if source_account_info == authority_info => {
                     // Comparing whether the AccountInfo's "point" to the same account or
@@ -58,7 +60,8 @@ pub fn process_withdraw_excess_lamports(accounts: &[AccountInfo]) -> ProgramResu
             }
         }
         Multisig::LEN => {
-            validate_owner(source_account_info.key(), authority_info, remaining)?;
+            // SAFETY: `authority_info` is not currently mutably borrowed.
+            unsafe { validate_owner(source_account_info.key(), authority_info, remaining)? };
         }
         _ => return Err(TokenError::InvalidState.into()),
     }

Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,8 @@ pub fn process_close_account(accounts: &[AccountInfo]) -> ProgramResult {`
`37`	`37`	`.unwrap_or(&source_account.owner);`
`38`	`38`
`39`	`39`	`if !source_account.is_owned_by_system_program_or_incinerator() {`
`40`		`- validate_owner(authority, authority_info, remaining)?;`
	`40`	+ // SAFETY: `authority_info` is not currently borrowed.
	`41`	`+ unsafe { validate_owner(authority, authority_info, remaining)? };`
`41`	`42`	`} else if destination_account_info.key() != &INCINERATOR_ID {`
`42`	`43`	`return Err(ProgramError::InvalidAccountData);`
`43`	`44`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,8 @@ pub fn process_revoke(accounts: &[AccountInfo]) -> ProgramResult {`
`28`	`28`	`return Err(TokenError::AccountFrozen.into());`
`29`	`29`	`}`
`30`	`30`
`31`		`- validate_owner(&source_account.owner, owner_info, remaining)?;`
	`31`	+ // SAFETY: `owner_info` is not currently borrowed.
	`32`	`+ unsafe { validate_owner(&source_account.owner, owner_info, remaining)? }`
`32`	`33`
`33`	`34`	`source_account.clear_delegate();`
`34`	`35`	`source_account.set_delegated_amount(0);`
Original file line number	Diff line number	Diff line change
`@@ -69,7 +69,8 @@ pub fn process_approve(`
`69`	`69`	`}`
`70`	`70`	`}`
`71`	`71`
`72`		`- validate_owner(&source_account.owner, owner_info, remaining)?;`
	`72`	+ // SAFETY: `owner_info` is not currently borrowed.
	`73`	`+ unsafe { validate_owner(&source_account.owner, owner_info, remaining)? };`
`73`	`74`
`74`	`75`	`// Sets the delegate and delegated amount.`
`75`	`76`
Original file line number	Diff line number	Diff line change
`@@ -54,7 +54,8 @@ pub fn process_burn(`
`54`	`54`	`if !source_account.is_owned_by_system_program_or_incinerator() {`
`55`	`55`	`match source_account.delegate() {`
`56`	`56`	`Some(delegate) if authority_info.key() == delegate => {`
`57`		`- validate_owner(delegate, authority_info, remaining)?;`
	`57`	+ // SAFETY: `authority_info` is not currently borrowed.
	`58`	`+ unsafe { validate_owner(delegate, authority_info, remaining)? };`
`58`	`59`
`59`	`60`	`let delegated_amount = source_account`
`60`	`61`	`.delegated_amount()`
`@@ -67,7 +68,8 @@ pub fn process_burn(`
`67`	`68`	`}`
`68`	`69`	`}`
`69`	`70`	`_ => {`
`70`		`- validate_owner(&source_account.owner, authority_info, remaining)?;`
	`71`	+ // SAFETY: `authority_info` is not currently borrowed.
	`72`	`+ unsafe { validate_owner(&source_account.owner, authority_info, remaining)? };`
`71`	`73`	`}`
`72`	`74`	`}`
`73`	`75`	`}`
Original file line number	Diff line number	Diff line change
`@@ -48,7 +48,8 @@ pub fn process_mint_to(`
`48`	`48`	`}`
`49`	`49`
`50`	`50`	`match mint.mint_authority() {`
`51`		`- Some(mint_authority) => validate_owner(mint_authority, owner_info, remaining)?,`
	`51`	+ // SAFETY: `owner_info` is not currently borrowed.
	`52`	`+ Some(mint_authority) => unsafe { validate_owner(mint_authority, owner_info, remaining)? },`
`52`	`53`	`None => return Err(TokenError::FixedSupply.into()),`
`53`	`54`	`}`
`54`	`55`
Original file line number	Diff line number	Diff line change
`@@ -127,7 +127,8 @@ pub fn process_transfer(`
`127`	`127`	`// Validates the authority (delegate or owner).`
`128`	`128`
`129`	`129`	`if source_account.delegate() == Some(authority_info.key()) {`
`130`		`- validate_owner(authority_info.key(), authority_info, remaining)?;`
	`130`	+ // SAFETY: `authority_info` is not currently borrowed.
	`131`	`+ unsafe { validate_owner(authority_info.key(), authority_info, remaining)? };`
`131`	`132`
`132`	`133`	`let delegated_amount = source_account`
`133`	`134`	`.delegated_amount()`
`@@ -142,7 +143,8 @@ pub fn process_transfer(`
`142`	`143`	`}`
`143`	`144`	`}`
`144`	`145`	`} else {`
`145`		`- validate_owner(&source_account.owner, authority_info, remaining)?;`
	`146`	+ // SAFETY: `authority_info` is not currently borrowed.
	`147`	`+ unsafe { validate_owner(&source_account.owner, authority_info, remaining)? };`
`146`	`148`	`}`
`147`	`149`
`148`	`150`	`if self_transfer \|\| amount == 0 {`
Original file line number	Diff line number	Diff line change
`@@ -30,15 +30,17 @@ pub fn process_withdraw_excess_lamports(accounts: &[AccountInfo]) -> ProgramResu`
`30`	`30`	`return Err(TokenError::NativeNotSupported.into());`
`31`	`31`	`}`
`32`	`32`
`33`		`- validate_owner(&account.owner, authority_info, remaining)?;`
	`33`	+ // SAFETY: `authority_info` is not currently borrowed.
	`34`	`+ unsafe { validate_owner(&account.owner, authority_info, remaining)? };`
`34`	`35`	`}`
`35`	`36`	`Mint::LEN => {`
`36`	`37`	// SAFETY: `source_data` has the same length as `Mint`.
`37`	`38`	`let mint = unsafe { load::<Mint>(source_data)? };`
`38`	`39`
`39`	`40`	`match mint.mint_authority() {`
`40`	`41`	`Some(mint_authority) => {`
`41`		`- validate_owner(mint_authority, authority_info, remaining)?;`
	`42`	+ // SAFETY: `authority_info` is not currently borrowed.
	`43`	`+ unsafe { validate_owner(mint_authority, authority_info, remaining)? };`
`42`	`44`	`}`
`43`	`45`	`None if source_account_info == authority_info => {`
`44`	`46`	`// Comparing whether the AccountInfo's "point" to the same account or`
`@@ -58,7 +60,8 @@ pub fn process_withdraw_excess_lamports(accounts: &[AccountInfo]) -> ProgramResu`
`58`	`60`	`}`
`59`	`61`	`}`
`60`	`62`	`Multisig::LEN => {`
`61`		`- validate_owner(source_account_info.key(), authority_info, remaining)?;`
	`63`	+ // SAFETY: `authority_info` is not currently mutably borrowed.
	`64`	`+ unsafe { validate_owner(source_account_info.key(), authority_info, remaining)? };`
`62`	`65`	`}`
`63`	`66`	`_ => return Err(TokenError::InvalidState.into()),`
`64`	`67`	`}`