8000 Fix/kernel panic by ianchen0119 · Pull Request #143 · free5gc/gtp5g · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Fix/kernel panic #143

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact 8000 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

Merged
merged 4 commits into from
Mar 31, 2025
Merged

Fix/kernel panic #143

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3bbed73
fix: add null check after get_urr_counter_by_trigger called
ianchen0119 Mar 28, 2025
1689f43
fix: update_urr_counter_and_send_report
ianchen0119 Mar 29, 2025
3af3115
update DRV_VERSION to v0.9.13
ianchen0119 Mar 29, 2025
84ebd0b
fix: report zero volume if counter is NULL
tim-ywliu Mar 29, 2025
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
2 changes: 1 addition & 1 deletion dkms.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
PACKAGE_NAME="gtp5g"
PACKAGE_VERSION="0.9.12"
PACKAGE_VERSION="0.9.13"

CLEAN="make clean KVER=$kernelver"
MAKE="make KVER=$kernelver"
Expand Down
2 changes: 1 addition & 1 deletion include/genl_version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#include "genl.h"

#define DRV_VERSION "0.9.12"
#define DRV_VERSION "0.9.13"

enum gtp5g_version {
GTP5G_VERSION
Expand Down
9 changes: 8 additions & 1 deletion src/genl/genl_report.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,6 +427,11 @@ int gtp5g_genl_fill_multi_usage_reports(struct sk_buff *skb, u32 snd_portid, u32

void convert_urr_to_report(struct urr *urr, struct VolumeMeasurement *urr_counter, struct usage_report *report)
{
struct VolumeMeasurement zeroVol;
if (urr_counter == NULL) {
urr_counter = &zeroVol;
memset(urr_counter, 0, sizeof(struct VolumeMeasurement));
}
urr->end_time = ktime_get_real();
*report = (struct usage_report ) {
urr->id,
Expand All @@ -438,7 +443,9 @@ void convert_urr_to_report(struct urr *urr, struct VolumeMeasurement *urr_counte
urr->seid
};

memset(urr_counter, 0, sizeof(struct VolumeMeasurement));
if (urr_counter != &zeroVol) {
memset(urr_counter, 0, sizeof(struct VolumeMeasurement));
}

urr->start_time = ktime_get_real();
}
2 changes: 1 addition & 1 deletion src/gtpu/encap.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,7 +740,7 @@ int update_urr_counter_and_send_report(struct pdr *pdr, struct far *far, u64 vol
ret = DONT_SEND_UL_PACKET;
}
urr_counter = get_urr_counter_by_trigger(urrs[i], triggers[i]);
convert_urr_to_report(urr, urr_counter, &report[i]);
convert_urr_to_report(urrs[i], urr_counter, &report[i]);

report[i].trigger = triggers[i];
}
Expand Down
0