diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..8a95f68 --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,7 @@ +version: 2 +updates: + - directory: / + open-pull-requests-limit: 5 + package-ecosystem: github-actions + schedule: + interval: weekly diff --git a/.github/workflows/dep-updates-am.yml b/.github/workflows/dep-updates-am.yml new file mode 100644 index 0000000..78eabbe --- /dev/null +++ b/.github/workflows/dep-updates-am.yml @@ -0,0 +1,18 @@ +name: Dependency updates auto-merge +on: pull_request + +permissions: + pull-requests: write + contents: write + checks: read + +jobs: + auto_merge: + runs-on: ubuntu-latest + if: ${{ github.actor == 'dependabot[bot]' }} + steps: + - name: Enable auto-merge for dependency update PRs + run: gh pr merge --auto -s "$PR_URL" + env: + PR_URL: ${{github.event.pull_request.html_url}} + GITHUB_TOKEN: ${{secrets.GITHUB_TOKEN}} diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml index 03480e7..44fdb08 100644 --- a/.github/workflows/publish.yml +++ b/.github/workflows/publish.yml @@ -11,22 +11,21 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - ghidra: ["10.1.5" ] + ghidra: ["10.2.2" ] steps: - - uses: actions/checkout@v1 - - uses: actions/setup-java@v1 + - uses: actions/checkout@v3 + - uses: actions/setup-java@v3 with: - java-version: "11" - java-package: jdk - architecture: x64 + distribution: "temurin" + java-version: "17" - uses: er28-0652/setup-ghidra@master with: version: ${{ matrix.ghidra }} - - uses: eskatos/gradle-command-action@v1 + - uses: eskatos/gradle-command-action@v2 with: gradle-version: current arguments: -PGHIDRA_INSTALL_DIR=${{ env.GHIDRA_INSTALL_DIR }} - - uses: svenstaro/upload-release-action@v1-release + - uses: svenstaro/upload-release-action@v2 with: repo_token: ${{ secrets.GITHUB_TOKEN }} file: dist/SwitchLoader-*.zip diff --git a/README.md b/README.md index 01f0ced..d8d77ab 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,20 @@ -## Ghidra Switch Loader +# Ghidra Switch Loader A loader for Ghidra supporting a variety of Nintendo Switch file formats. ## Building -- Ensure you have ``JAVA_HOME`` set to the path of your JDK 11 installation. + +- Ensure you have ``JAVA_HOME`` set to the path of your JDK 17 installation. - Set ``GHIDRA_INSTALL_DIR`` to your Ghidra install directory. This can be done in one of the following ways: - - **Windows**: Running ``set GHIDRA_INSTALL_DIR=`` - - **macos/Linux**: Running ``export GHIDRA_INSTALL_DIR=`` - - Using ``-PGHIDRA_INSTALL_DIR=`` when running ``./gradlew`` - - Adding ``GHIDRA_INSTALL_DIR`` to your Windows environment variables. + - **Windows**: Running ``set GHIDRA_INSTALL_DIR=`` + - **macos/Linux**: Running ``export GHIDRA_INSTALL_DIR=`` + - Using ``-PGHIDRA_INSTALL_DIR=`` when running ``./gradlew`` + - Adding ``GHIDRA_INSTALL_DIR`` to your Windows environment variables. - Run ``./gradlew`` - You'll find the output zip file inside `/dist` ## Installation + - Start Ghidra and use the "Install Extensions" dialog (``File -> Install Extensions...``). - Press the ``+`` button in the upper right corner. -- Select the zip file in the file browser, then restart Ghidra. \ No newline at end of file +- Select the zip file in the file browser, then restart Ghidra. diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 87b738c..249e583 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 05679dc..ae04661 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.5.1-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index af6708f..a69d9cb 100644 --- a/gradlew +++ b/gradlew @@ -1,78 +1,129 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/master/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null + +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +APP_BASE_NAME=${0##*/} # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m"' +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -89,84 +140,101 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 6d57edc..f127cfd 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,20 @@ -@if "%DEBUG%" == "" @echo off +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -9,19 +25,22 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +54,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,38 +64,26 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/src/main/java/adubbz/nx/analyzer/IPCAnalyzer.java b/src/main/java/adubbz/nx/analyzer/IPCAnalyzer.java index c372706..b03de9d 100644 --- a/src/main/java/adubbz/nx/analyzer/IPCAnalyzer.java +++ b/src/main/java/adubbz/nx/analyzer/IPCAnalyzer.java @@ -7,12 +7,7 @@ package adubbz.nx.analyzer; import java.io.IOException; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.stream.Collectors; import org.apache.commons.compress.utils.Lists; @@ -40,7 +35,6 @@ import ghidra.program.model.address.AddressOutOfBoundsException; import ghidra.program.model.address.AddressSetView; import ghidra.program.model.address.AddressSpace; -import ghidra.program.model.data.DataTypeConflictException; import ghidra.program.model.data.PointerDataType; import ghidra.program.model.listing.CodeUnit; import ghidra.program.model.listing.Data; @@ -85,7 +79,7 @@ public void registerOptions(Options options, Program program) } @Override - public boolean added(Program program, AddressSetView set, TaskMonitor monitor, MessageLog log) throws CancelledException + public boolean added(Program program, AddressSetView set, TaskMonitor monitor, MessageLog log) { Memory memory = program.getMemory(); MemoryBlock text = memory.getBlock(".text"); @@ -162,7 +156,7 @@ private List
locateIpcVtables(Program program, ElfCompatibilityProvider if (thisBlock == null || thisBlock.getName().equals(".rodata")) continue; - String symbol = elfProvider.getReader().readTerminatedString(thisAddr.getOffset(), '\0'); + String symbol = elfProvider.getReader().readAsciiString(thisAddr.getOffset()); if (symbol.isEmpty() || symbol.length() > 512) continue; @@ -253,7 +247,7 @@ protected List createVTableEntries(Program program, ElfCompatibi if (thisBlock != null && thisBlock.getName().equals(".rodata")) { - String symbol = elfProvider.getReader().readTerminatedString(thisAddr.getOffset(), '\0'); + String symbol = elfProvider.getReader().readAsciiString(thisAddr.getOffset()); if (!symbol.isEmpty() && symbol.length() <= 512) { @@ -269,7 +263,7 @@ protected List createVTableEntries(Program program, ElfCompatibi Map gotDataSyms = this.getGotDataSyms(program, elfProvider); List
implAddrs = new ArrayList<>(); long funcVtOff = 0x30; - long funcOff = 0; + long funcOff; // Find all ipc impl functions in the vtable while ((funcOff = mem.getLong(vtAddr.add(funcVtOff))) != 0) @@ -284,13 +278,13 @@ protected List createVTableEntries(Program program, ElfCompatibi } else break; - if (gotDataSyms.values().contains(vtAddr.add(funcVtOff))) + if (gotDataSyms.containsValue(vtAddr.add(funcVtOff))) { break; } } - Set
uniqueAddrs = new HashSet
(implAddrs); + Set
uniqueAddrs = new HashSet<>(implAddrs); // There must be either 1 unique function without repeats, or more than one unique function with repeats allowed if (uniqueAddrs.size() <= 1 && implAddrs.size() != 1) @@ -328,10 +322,10 @@ protected HashBiMap locateSTables(Program program, ElfCompatib for (NXRelocation reloc : elfProvider.getRelocations()) { if (reloc.addend > 0) - candidates.add(new Pair(baseAddr.getOffset() + reloc.addend, baseAddr.getOffset() + reloc.offset)); + candidates.add(new Pair<>(baseAddr.getOffset() + reloc.addend, baseAddr.getOffset() + reloc.offset)); } - candidates.sort((a, b) -> a.first.compareTo(b.first)); + candidates.sort(Comparator.comparing(a -> a.first)); // 5.x: match on the "SFCI" constant used in the template of s_Table @@ -438,7 +432,7 @@ protected Multimap emulateProcessFunctions(Program program, T { List traces = Lists.newArrayList(map.get(procFuncAddr).iterator()); - traces.sort((a, b) -> ((Long)a.cmdId).compareTo(b.cmdId)); + traces.sort(Comparator.comparingLong(a -> a.cmdId)); for (IPCTrace trace : traces) { @@ -458,7 +452,7 @@ protected HashBiMap matchVtables(List v for (Address procFuncAddr : procFuncAddrs) { // We've already found this address. No need to do it again - if (out.keySet().contains(procFuncAddr)) + if (out.containsKey(procFuncAddr)) continue; List filteredPossibilities = possibilities.stream().filter(vtEntry -> vtEntry.ipcFuncs.size() == getProcFuncVTableSize(processFuncTraces, procFuncAddr)).collect(Collectors.toList()); @@ -486,7 +480,7 @@ protected HashBiMap matchVtables(List v // Iterate over all the possible vtables with a size greater than our current process function for (IPCVTableEntry filteredPossibility : filteredPossibilities) { - List
unlocatedProcFuncAddrs = procFuncAddrs.stream().filter(pFAddr -> !out.keySet().contains(pFAddr)).collect(Collectors.toList()); + List
unlocatedProcFuncAddrs = procFuncAddrs.stream().filter(pFAddr -> !out.containsKey(pFAddr)).toList(); // See if there is only a single trace set of size <= this vtable // For example, if the process func vtable size is found by emulation to be 0x100, and we have previously found vtables of the following sizes, which have yet to be located: @@ -494,7 +488,7 @@ protected HashBiMap matchVtables(List v // We will run this loop for both 0x110 and 0x230. // In the case of 0x110, we will then filter for sizes <= 0x110. These are 0x10, 0x20, 0x60 and 0x110 // As there are four of these, the check will fail. - if (unlocatedProcFuncAddrs.stream().filter(unlocatedProcFuncAddr -> getProcFuncVTableSize(processFuncTraces, unlocatedProcFuncAddr) <= filteredPossibility.ipcFuncs.size()).collect(Collectors.toList()).size() == 1) + if (unlocatedProcFuncAddrs.stream().filter(unlocatedProcFuncAddr -> getProcFuncVTableSize(processFuncTraces, unlocatedProcFuncAddr) <= filteredPossibility.ipcFuncs.size()).count() == 1) { out.put(procFuncAddr, filteredPossibility); possibilities.remove(filteredPossibility); @@ -503,7 +497,7 @@ protected HashBiMap matchVtables(List v } } - List
unlocatedProcFuncAddrs = procFuncAddrs.stream().filter(pFAddr -> !out.keySet().contains(pFAddr)).collect(Collectors.toList()); + List
unlocatedProcFuncAddrs = procFuncAddrs.stream().filter(pFAddr -> !out.containsKey(pFAddr)).toList(); for (Address addr : unlocatedProcFuncAddrs) { @@ -552,7 +546,7 @@ protected void markupIpc(Program program, TaskMonitor monitor, List name = "AddReference"; + case 1 -> name = "Release"; + case 2 -> name = "GetProxyInfo"; + // Shared by everything + case 3 -> name = "nn::sf::IServiceObject::GetInterfaceTypeInfo"; } if (i == 3) // For now, only label GetInterfaceTypeInfo. We need better heuristics for the others as they may be shared. @@ -606,7 +589,7 @@ protected void markupIpc(Program program, TaskMonitor monitor, List getGotDataSyms(Program program, ElfCompatibility return this.gotDataSyms; Address baseAddr = program.getImageBase(); - gotDataSyms = new HashMap(); + gotDataSyms = new HashMap<>(); for (NXRelocation reloc : elfProvider.getRelocations()) { @@ -810,7 +794,7 @@ protected int createPointer(Program program, Address address) { d = program.getListing().createData(address, PointerDataType.dataType, 8); } - catch (CodeUnitInsertionException | DataTypeConflictException e) + catch (CodeUnitInsertionException e) { Msg.error(this, String.format("Failed to create pointer at 0x%X", address.getOffset()), e); } diff --git a/src/main/java/adubbz/nx/analyzer/ipc/IPCEmulator.java b/src/main/java/adubbz/nx/analyzer/ipc/IPCEmulator.java index bf79b9e..b9b1bc4 100644 --- a/src/main/java/adubbz/nx/analyzer/ipc/IPCEmulator.java +++ b/src/main/java/adubbz/nx/analyzer/ipc/IPCEmulator.java @@ -131,7 +131,7 @@ public boolean unknownAddress(Address address, boolean write) this.bTable = new BreakTableCallBack(this.sLang); this.emu = new Emulate(this.sLang, this.state, this.bTable); - this.disassembler = Disassembler.getDisassembler(this.program, TaskMonitorAdapter.DUMMY_MONITOR, null); + this.disassembler = Disassembler.getDisassembler(this.program, TaskMonitorAdapter.DUMMY, null); // Copy over our binary to the emulator's memory, typically 7100000000 Memory programMemory = this.program.getMemory(); diff --git a/src/main/java/adubbz/nx/analyzer/ipc/IPCTrace.java b/src/main/java/adubbz/nx/analyzer/ipc/IPCTrace.java index 4f252ea..1d52378 100644 --- a/src/main/java/adubbz/nx/analyzer/ipc/IPCTrace.java +++ b/src/main/java/adubbz/nx/analyzer/ipc/IPCTrace.java @@ -42,28 +42,28 @@ public boolean isCorrect() { return true; } - - if (vtOffset == -1) - return false; - - return true; + + return vtOffset != -1; } public void printTrace() { - String out = "\n--------------------\n"+ - "0x%X, Cmd 0x%X \n" + - "--------------------\n" + - "Lr: 0x%X\n" + - "Vt: 0x%X\n" + - "Bytes In: 0x%X\n" + - "Bytes Out: 0x%X\n" + - "Buffer Count: 0x%X\n" + - "In Interfaces: 0x%X\n" + - "Out Interfaces: 0x%X\n" + - "In Handles: 0x%X\n" + - "Out Handles: 0x%X\n" + - "--------------------\n"; + String out = """ + + -------------------- + 0x%X, Cmd 0x%X \s + -------------------- + Lr: 0x%X + Vt: 0x%X + Bytes In: 0x%X + Bytes Out: 0x%X + Buffer Count: 0x%X + In Interfaces: 0x%X + Out Interfaces: 0x%X + In Handles: 0x%X + Out Handles: 0x%X + -------------------- + """; out = String.format(out, procFuncAddr, cmdId, lr, vtOffset, bytesIn, bytesOut, bufferCount, inInterfaces, outInterfaces, inHandles, outHandles); diff --git a/src/main/java/adubbz/nx/common/ElfCompatibilityProvider.java b/src/main/java/adubbz/nx/common/ElfCompatibilityProvider.java index bfe9816..e40bc0a 100644 --- a/src/main/java/adubbz/nx/common/ElfCompatibilityProvider.java +++ b/src/main/java/adubbz/nx/common/ElfCompatibilityProvider.java @@ -7,8 +7,6 @@ package adubbz.nx.common; import java.io.IOException; -import java.lang.reflect.InvocationTargetException; -import java.lang.reflect.Method; import java.util.ArrayList; import java.util.Comparator; import java.util.HashMap; @@ -17,19 +15,10 @@ import java.util.Set; import adubbz.nx.util.FullMemoryByteProvider; -import adubbz.nx.util.LegacyFactoryBundledWithBinaryReader; -import generic.continues.RethrowContinuesFactory; +import adubbz.nx.util.LegacyBinaryReader; import ghidra.app.util.bin.BinaryReader; import ghidra.app.util.bin.ByteProvider; -import ghidra.app.util.bin.format.FactoryBundledWithBinaryReader; -import ghidra.app.util.bin.format.elf.ElfDynamic; -import ghidra.app.util.bin.format.elf.ElfDynamicTable; -import ghidra.app.util.bin.format.elf.ElfDynamicType; -import ghidra.app.util.bin.format.elf.ElfHeader; -import ghidra.app.util.bin.format.elf.ElfSectionHeader; -import ghidra.app.util.bin.format.elf.ElfStringTable; -import ghidra.app.util.bin.format.elf.ElfSymbol; -import ghidra.app.util.bin.format.elf.ElfSymbolTable; +import ghidra.app.util.bin.format.elf.*; import ghidra.app.util.bin.format.elf.extend.ElfExtensionFactory; import ghidra.app.util.bin.format.elf.extend.ElfLoadAdapter; import ghidra.app.util.bin.format.elf.relocation.AARCH64_ElfRelocationConstants; @@ -43,7 +32,7 @@ public class ElfCompatibilityProvider { private Program program; private ByteProvider provider; - private FactoryBundledWithBinaryReader factoryReader; + private BinaryReader binaryReader; boolean isAarch32; private ElfHeader dummyElfHeader; @@ -60,9 +49,13 @@ public ElfCompatibilityProvider(Program program, ByteProvider provider, boolean { this.program = program; this.provider = provider; - this.factoryReader = new LegacyFactoryBundledWithBinaryReader(RethrowContinuesFactory.INSTANCE, this.provider, true); + this.binaryReader = new LegacyBinaryReader(this.provider, true); this.isAarch32 = isAarch32; - this.dummyElfHeader = new DummyElfHeader(isAarch32); + try { + this.dummyElfHeader = new DummyElfHeader(isAarch32); + } catch (ElfException e) { + Msg.error(this, "Couldn't construct DummyElfHeader", e); + } } public ElfCompatibilityProvider(Program program, boolean isAarch32) @@ -74,14 +67,14 @@ public ElfDynamicTable getDynamicTable() { if (this.dynamicTable != null) return this.dynamicTable; - + MemoryBlock dynamic = this.getDynamicBlock(); if (dynamic == null) return null; try { - this.dynamicTable = ElfDynamicTable.createDynamicTable(this.factoryReader, this.dummyElfHeader, dynamic.getStart().getOffset(), dynamic.getStart().getOffset()); + this.dynamicTable = new ElfDynamicTable(this.binaryReader, this.dummyElfHeader, dynamic.getStart().getOffset(), dynamic.getStart().getOffset()); } catch (IOException e) { @@ -106,10 +99,10 @@ public ElfStringTable getStringTable() long dynamicStringTableAddr = this.program.getImageBase().getOffset() + dynamicTable.getDynamicValue(ElfDynamicType.DT_STRTAB); long dynamicStringTableSize = dynamicTable.getDynamicValue(ElfDynamicType.DT_STRSZ); - this.stringTable = ElfStringTable.createElfStringTable(this.factoryReader, this.dummyElfHeader, + this.stringTable = new ElfStringTable(this.dummyElfHeader, null, dynamicStringTableAddr, dynamicStringTableAddr, dynamicStringTableSize); } - catch (IOException | NotFoundException e) + catch (NotFoundException e) { Msg.error(this, "Failed to create string table", e); } @@ -135,7 +128,7 @@ public String[] getDynamicLibraryNames() { try { - this.dynamicLibraryNames[i] = stringTable.readString(this.factoryReader, needed[i].getValue()); + this.dynamicLibraryNames[i] = stringTable.readString(this.binaryReader, needed[i].getValue()); } catch (Exception e) { @@ -166,21 +159,17 @@ public ElfSymbolTable getSymbolTable() long symbolTableOff = dynamicTable.getDynamicValue(ElfDynamicType.DT_SYMTAB) + this.program.getImageBase().getOffset(); long symbolEntrySize = dynamicTable.getDynamicValue(ElfDynamicType.DT_SYMENT); long dtHashOff = dynamicTable.getDynamicValue(ElfDynamicType.DT_HASH); - long nchain = this.factoryReader.readUnsignedInt(this.program.getImageBase().getOffset() + dtHashOff + 4); + long nchain = this.binaryReader.readUnsignedInt(this.program.getImageBase().getOffset() + dtHashOff + 4); long symbolTableSize = nchain * symbolEntrySize; - Method m = ElfSymbolTable.class.getDeclaredMethod("createElfSymbolTable", FactoryBundledWithBinaryReader.class, ElfHeader.class, ElfSectionHeader.class, long.class, long.class, - long.class, long.class, ElfStringTable.class, boolean.class); - m.setAccessible(true); - - symbolTable = (ElfSymbolTable)m.invoke(null, this.factoryReader, this.dummyElfHeader, null, + symbolTable = new ElfSymbolTable(this.binaryReader, this.dummyElfHeader, null, symbolTableOff, symbolTableOff, symbolTableSize, symbolEntrySize, - stringTable, true); + stringTable, null, true); } - catch (NoSuchMethodException | IllegalAccessException | IllegalArgumentException | InvocationTargetException | NotFoundException | IOException e) + catch (IllegalArgumentException | NotFoundException | IOException e) { Msg.error(this, "Failed to create symbol table", e); } @@ -205,8 +194,8 @@ public List getPltRelocations() { Msg.info(this, "Processing JMPREL relocations..."); this.processRelocations(this.pltRelocs, symbolTable, - (long)dynamicTable.getDynamicValue(ElfDynamicType.DT_JMPREL), - (long)dynamicTable.getDynamicValue(ElfDynamicType.DT_PLTRELSZ)); + dynamicTable.getDynamicValue(ElfDynamicType.DT_JMPREL), + dynamicTable.getDynamicValue(ElfDynamicType.DT_PLTRELSZ)); this.pltRelocs.sort(Comparator.comparing(reloc -> reloc.offset)); } @@ -236,16 +225,16 @@ public List getRelocations() { Msg.info(this, "Processing DT_REL relocations..."); processRelocations(this.relocs, this.symbolTable, - (long)this.dynamicTable.getDynamicValue(ElfDynamicType.DT_REL), - (long)this.dynamicTable.getDynamicValue(ElfDynamicType.DT_RELSZ)); + this.dynamicTable.getDynamicValue(ElfDynamicType.DT_REL), + this.dynamicTable.getDynamicValue(ElfDynamicType.DT_RELSZ)); } if (dynamicTable.containsDynamicValue(ElfDynamicType.DT_RELA)) { Msg.info(this, "Processing DT_RELA relocations..."); processRelocations(this.relocs, this.symbolTable, - (long)this.dynamicTable.getDynamicValue(ElfDynamicType.DT_RELA), - (long)this.dynamicTable.getDynamicValue(ElfDynamicType.DT_RELASZ)); + this.dynamicTable.getDynamicValue(ElfDynamicType.DT_RELA), + this.dynamicTable.getDynamicValue(ElfDynamicType.DT_RELASZ)); } } catch (NotFoundException | IOException e) @@ -259,7 +248,7 @@ public List getRelocations() private Set processRelocations(List relocs, ElfSymbolTable symtab, long rel, long relsz) throws IOException { - Set locations = new HashSet(); + Set locations = new HashSet<>(); int relocSize = this.isAarch32 ? 0x8 : 0x18; for (long i = 0; i < relsz / relocSize; i++) @@ -276,17 +265,17 @@ private Set processRelocations(List relocs, ElfSymbolTable s // and all 64-bit ones do. if (this.isAarch32) { - offset = this.factoryReader.readInt(base + rel + i * 0x8); - info = this.factoryReader.readInt(base + rel + i * 0x8 + 4); + offset = this.binaryReader.readInt(base + rel + i * 0x8); + info = this.binaryReader.readInt(base + rel + i * 0x8 + 4); addend = 0; r_type = info & 0xff; r_sym = info >> 8; } else { - offset = this.factoryReader.readLong(base + rel + i * 0x18); - info = this.factoryReader.readLong(base + rel + i * 0x18 + 8); - addend = this.factoryReader.readLong(base + rel + i * 0x18 + 0x10); + offset = this.binaryReader.readLong(base + rel + i * 0x18); + info = this.binaryReader.readLong(base + rel + i * 0x18 + 8); + addend = this.binaryReader.readLong(base + rel + i * 0x18 + 0x10); r_type = info & 0xffffffffL; r_sym = info >> 32; } @@ -316,7 +305,7 @@ protected MemoryBlock getDynamicBlock() public BinaryReader getReader() { - return this.factoryReader; + return this.binaryReader; } // Fake only what is needed for an elf dynamic table @@ -325,8 +314,9 @@ public static class DummyElfHeader extends ElfHeader boolean isAarch32; private HashMap dynamicTypeMap; - public DummyElfHeader(boolean isAarch32) - { + public DummyElfHeader(boolean isAarch32) throws ElfException { + super(ByteProvider.EMPTY_BYTEPROVIDER, s -> {}); + this.isAarch32 = isAarch32; dynamicTypeMap = new HashMap<>(); ElfDynamicType.addDefaultTypes(this.dynamicTypeMap); @@ -337,9 +327,12 @@ public DummyElfHeader(boolean isAarch32) extensionAdapter.addDynamicTypes(this.dynamicTypeMap); } } - + + @Override + protected void initElfHeader() { } + @Override - protected HashMap getDynamicTypeMap() + protected HashMap getDynamicTypeMap() { return this.dynamicTypeMap; } diff --git a/src/main/java/adubbz/nx/common/InvalidMagicException.java b/src/main/java/adubbz/nx/common/InvalidMagicException.java index c24d24d..260421c 100644 --- a/src/main/java/adubbz/nx/common/InvalidMagicException.java +++ b/src/main/java/adubbz/nx/common/InvalidMagicException.java @@ -6,10 +6,8 @@ */ package adubbz.nx.common; -public class InvalidMagicException extends RuntimeException +public class InvalidMagicException extends RuntimeException { - private static final long serialVersionUID = 1L; - public InvalidMagicException(String magic) { super(String.format("Invalid %s magic!", magic)); diff --git a/src/main/java/adubbz/nx/loader/SwitchLoader.java b/src/main/java/adubbz/nx/loader/SwitchLoader.java index 79961ef..a11ffbc 100644 --- a/src/main/java/adubbz/nx/loader/SwitchLoader.java +++ b/src/main/java/adubbz/nx/loader/SwitchLoader.java @@ -99,9 +99,9 @@ else if (magic_0x10.equals("KIP1")) } @Override - protected List loadProgram(ByteProvider provider, String programName, - DomainFolder programFolder, LoadSpec loadSpec, List