Skip to content

Commit

Permalink
Make sure we don't trash our userinfo after we get it and before we s…
Browse files Browse the repository at this point in the history
…end it. (project-chip#26373)

findOccupiedUserSlot can end up overwriting some of the buffers that
emberAfPluginDoorLockGetUser uses, so we need to make sure we call
findOccupiedUserSlot before emberAfPluginDoorLockGetUser (or after we are done
using the output from emberAfPluginDoorLockGetUser).
  • Loading branch information
bzbarsky-apple committed May 8, 2023
1 parent 8f66f42 commit c32680c
Showing 1 changed file with 14 additions and 7 deletions.
21 changes: 14 additions & 7 deletions src/app/clusters/door-lock-server/door-lock-server.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -453,6 +453,20 @@ void DoorLockServer::getUserCommandHandler(chip::app::CommandHandler * commandOb
return;
}

Commands::GetUserResponse::Type response;

// appclusters, 5.2.4.36.1: We need to add next occupied user after userIndex if any.
//
// We want to do this before we call emberAfPluginDoorLockGetUser, because this will
// make its own emberAfPluginDoorLockGetUser calls, and a
// EmberAfPluginDoorLockUserInfo might be pointing into some application-static
// buffers (for its credentials and whatnot).
uint16_t nextAvailableUserIndex = 0;
if (findOccupiedUserSlot(commandPath.mEndpointId, static_cast<uint16_t>(userIndex + 1), nextAvailableUserIndex))
{
response.nextUserIndex.SetNonNull(nextAvailableUserIndex);
}

EmberAfPluginDoorLockUserInfo user;
if (!emberAfPluginDoorLockGetUser(commandPath.mEndpointId, userIndex, user))
{
Expand All @@ -461,7 +475,6 @@ void DoorLockServer::getUserCommandHandler(chip::app::CommandHandler * commandOb
return;
}

Commands::GetUserResponse::Type response;
response.userIndex = userIndex;

// appclusters, 5.2.4.36: we should not set user-specific fields to non-null if the user status is set to Available
Expand Down Expand Up @@ -498,12 +511,6 @@ void DoorLockServer::getUserCommandHandler(chip::app::CommandHandler * commandOb
emberAfDoorLockClusterPrintln("[GetUser] User not found [userIndex=%d]", userIndex);
}

// appclusters, 5.2.4.36.1: We need to add next occupied user after userIndex if any.
uint16_t nextAvailableUserIndex = 0;
if (findOccupiedUserSlot(commandPath.mEndpointId, static_cast<uint16_t>(userIndex + 1), nextAvailableUserIndex))
{
response.nextUserIndex.SetNonNull(nextAvailableUserIndex);
}
commandObj->AddResponse(commandPath, response);
}

Expand Down

0 comments on commit c32680c

Please sign in to comment.