Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix setactiveslot by sending multiple patch chunks #513

Merged
merged 5 commits into from
Mar 6, 2024
Merged

Fix setactiveslot by sending multiple patch chunks #513

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
762c763
tmp fix
bongbui321 Mar 6, 2024
bd36481
Merge branch 'master' into fix_setactiveslot
bongbui321 Mar 6, 2024
69d9a7e
fix setactiveslot
bongbui321 Mar 6, 2024
8f09c49
set every active partition
bongbui321 Mar 6, 2024
195a50c
fix indent
bongbui321 Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 48 additions & 24 deletions edlclient/Library/firehose.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1303,6 +1303,26 @@ def cmd_getstorageinfo(self):
return None

def cmd_setactiveslot(self, slot: str):
def cmd_patch_multiple(lun, start_sector_patch, byte_offset_patch, headeroffset, pdata, header):
offset = 0
header_size = len(header)
size_each_patch = 4
write_size = len(pdata)
for i in range(0, write_size, size_each_patch):
pdata_subset = int(unpack("<I", pdata[offset:offset+size_each_patch])[0])
self.cmd_patch( lun, start_sector_patch, \
byte_offset_patch + offset, \
pdata_subset, \
size_each_patch, True)
if i < header_size:
header_subset = int(unpack("<I", header[offset:offset+size_each_patch])[0])
self.cmd_patch( lun, headeroffset, \
offset, \
header_subset, \
size_each_patch, True)
offset += size_each_patch
return True

if slot.lower() not in ["a", "b"]:
self.error("Only slots a or b are accepted. Aborting.")
return False
Expand All @@ -1314,30 +1334,34 @@ def cmd_setactiveslot(self, slot: str):
partslots["_a"] = False
partslots["_b"] = True
fpartitions = {}
for lun in self.luns:
lunname = "Lun" + str(lun)
fpartitions[lunname] = []
data, guid_gpt = self.get_gpt(lun, int(0), int(0), int(0))
if guid_gpt is None:
break
else:
for partitionname in guid_gpt.partentries:
gp = gpt()
slot = partitionname.lower()[-2:]
if "_a" in slot or "_b" in slot:
pdata, poffset = gp.patch(data, partitionname, active=partslots[slot])
data[poffset:poffset + len(pdata)] = pdata
wdata = gp.fix_gpt_crc(data)
if wdata is not None:
start_sector_patch = poffset // self.cfg.SECTOR_SIZE_IN_BYTES
byte_offset_patch = poffset % self.cfg.SECTOR_SIZE_IN_BYTES
headeroffset = gp.header.current_lba * gp.sectorsize
start_sector_hdr = headeroffset // self.cfg.SECTOR_SIZE_IN_BYTES
header = wdata[start_sector_hdr:start_sector_hdr + gp.header.header_size]
self.cmd_patch(lun, start_sector_patch, byte_offset_patch, pdata, len(pdata), True)
self.cmd_patch(lun, headeroffset, 0, header, len(pdata), True)
return True
return False
try:
for lun in self.luns:
lunname = "Lun" + str(lun)
fpartitions[lunname] = []
data, guid_gpt = self.get_gpt(lun, int(0), int(0), int(0))
if guid_gpt is None:
break
else:
for partitionname in guid_gpt.partentries:
gp = gpt()
slot = partitionname.lower()[-2:]
if "_a" in slot or "_b" in slot:
pdata, poffset = gp.patch(data, partitionname, active=partslots[slot])
data[poffset:poffset + len(pdata)] = pdata
wdata = gp.fix_gpt_crc(data)
if wdata is not None:
start_sector_patch = poffset // self.cfg.SECTOR_SIZE_IN_BYTES
byte_offset_patch = poffset % self.cfg.SECTOR_SIZE_IN_BYTES
headeroffset = gp.header.current_lba * gp.sectorsize
start_sector_hdr = headeroffset // self.cfg.SECTOR_SIZE_IN_BYTES
header = wdata[start_sector_hdr:start_sector_hdr + gp.header.header_size]
cmd_patch_multiple(lun, start_sector_patch, byte_offset_patch, headeroffset, pdata, header)
except Exception as err:
self.error(str(err))
return False
return True



def cmd_test(self, cmd):
token = "1234"
Expand Down
4 changes: 2 additions & 2 deletions edlclient/Library/gpt.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ def __init__(self, data):
self.name = sh.string(72)

def create(self):
val = pack("16s16sQQQ72s", self.type, self.unique, self.first_lba, self.last_lba, self.flags, self.name)
val = pack("<16s16sQQQ72s", self.type, self.unique, self.first_lba, self.last_lba, self.flags, self.name)
return val

class efi_type(Enum):
Expand Down Expand Up @@ -498,7 +498,7 @@ def patch(self, data:bytes, partitionname="boot", active: bool = True):
if active:
flags |= AB_PARTITION_ATTR_SLOT_ACTIVE << (AB_FLAG_OFFSET*8)
else:
flags |= AB_PARTITION_ATTR_UNBOOTABLE << (AB_FLAG_OFFSET*8)
flags &= AB_PARTITION_ATTR_UNBOOTABLE << (AB_FLAG_OFFSET*8)
partentry.flags = flags
pdata = partentry.create()
return pdata, partition.entryoffset
Expand Down
Loading