mirrors/fort
1
0
Fork 0
mirror of https://github.com/tnodir/fort synced 2024-11-15 06:35:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Driver: Require version validation.

Browse Source
This commit is contained in:
Nodir Temirkhodjaev 2020-02-14 14:40:44 +05:00
parent d486debc45
commit 09f3d6d145
4 changed files with 15 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/common/fortconf.h
View File

@ -142,8 +142,6 @@ typedef struct fort_conf_version {
} FORT_CONF_VERSION, *PFORT_CONF_VERSION;
typedef struct fort_conf_io {
UINT16 driver_version;
FORT_CONF_GROUP conf_group;
FORT_CONF conf;

5
src/driver/fortcnf.c
View File

@ -39,8 +39,9 @@ typedef struct fort_conf_ref {
#define FORT_DEVICE_PROV_BOOT 0x01
#define FORT_DEVICE_IS_OPENED 0x02
#define FORT_DEVICE_POWER_OFF 0x04
#define FORT_DEVICE_FILTER_TRANSPORT 0x08
#define FORT_DEVICE_IS_VALIDATED 0x04
#define FORT_DEVICE_POWER_OFF 0x08
#define FORT_DEVICE_FILTER_TRANSPORT 0x10
typedef struct fort_device_conf {
UCHAR volatile flags;

17
src/driver/fortdrv.c
View File

@ -905,7 +905,8 @@ static NTSTATUS
fort_device_cleanup (PDEVICE_OBJECT device, PIRP irp)
{
/* Device closed */
fort_device_flag_set(&g_device->conf, FORT_DEVICE_IS_OPENED, FALSE);
fort_device_flag_set(&g_device->conf,
(FORT_DEVICE_IS_OPENED | FORT_DEVICE_IS_VALIDATED), FALSE);
/* Clear conf */
{
@ -949,14 +950,20 @@ fort_device_control (PDEVICE_OBJECT device, PIRP irp)
irp_stack = IoGetCurrentIrpStackLocation(irp);
control_code = irp_stack->Parameters.DeviceIoControl.IoControlCode;
if (control_code != FORT_IOCTL_VALIDATE
&& !fort_device_flag(&g_device->conf, FORT_DEVICE_IS_VALIDATED))
goto end;
switch (control_code) {
case FORT_IOCTL_VALIDATE: {
const PFORT_CONF_VERSION conf_ver = irp->AssociatedIrp.SystemBuffer;
const ULONG len = irp_stack->Parameters.DeviceIoControl.InputBufferLength;
if (len == sizeof(FORT_CONF_VERSION)) {
status = (conf_ver->driver_version == DRIVER_VERSION)
? STATUS_SUCCESS : STATUS_UNSUCCESSFUL;
if (conf_ver->driver_version == DRIVER_VERSION) {
fort_device_flag_set(&g_device->conf, FORT_DEVICE_IS_VALIDATED, TRUE);
status = STATUS_SUCCESS;
}
}
break;
}
@ -964,8 +971,7 @@ fort_device_control (PDEVICE_OBJECT device, PIRP irp)
const PFORT_CONF_IO conf_io = irp->AssociatedIrp.SystemBuffer;
const ULONG len = irp_stack->Parameters.DeviceIoControl.InputBufferLength;
if (len > sizeof(FORT_CONF_IO)
&& conf_io->driver_version == DRIVER_VERSION) {
if (len > sizeof(FORT_CONF_IO)) {
const PFORT_CONF conf = &conf_io->conf;
PFORT_CONF_REF conf_ref = fort_conf_ref_new(
conf, len - FORT_CONF_IO_CONF_OFF);
@ -1055,6 +1061,7 @@ fort_device_control (PDEVICE_OBJECT device, PIRP irp)
default: break;
}
end:
if (!NT_SUCCESS(status) && status != FORT_STATUS_USER_ERROR) {
DbgPrintEx(DPFLTR_IHVNETWORK_ID, DPFLTR_ERROR_LEVEL,
"FORT: Device Control: Error: %x\n", status);

2
src/ui/util/conf/confutil.cpp
View File

@ -464,8 +464,6 @@ void ConfUtil::writeData(char *output, const FirewallConf &conf,
writeApps(&data, exeAppsMap);
#undef CONF_DATA_OFFSET
drvConfIo->driver_version = DRIVER_VERSION;
writeFragmentBits(&drvConfIo->conf_group.fragment_bits,
conf);