Fix winesync patches (#509)

Fix uninitialized variable
This commit is contained in:
Dmitry Skvortsov
2022-05-04 02:03:21 +03:00
committed by GitHub
parent 08b1f742a4
commit 599eb501b1
10 changed files with 27 additions and 36 deletions

View File

@@ -327,7 +327,7 @@ case $_basever in
'19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a' '19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
'b302ba6c5bbe8ed19b20207505d513208fae1e678cf4d8e7ac0b154e5fe3f456' 'b302ba6c5bbe8ed19b20207505d513208fae1e678cf4d8e7ac0b154e5fe3f456'
'f46ed0f026490b11b6a6cfb21e78cd253f0d7c308dc5a34e93971659a4eaa19e' 'f46ed0f026490b11b6a6cfb21e78cd253f0d7c308dc5a34e93971659a4eaa19e'
'f408b327ff4e6f1ee2343cfe69430b1e0b6fb40e263f1ec8a3a1eab559e23175' '0b66da5f767c66a40a36e8deaa2e384a20421328dc7cb454221c2dd44fee8a0b'
'377d0eb1df251808b8280d1aec598b4a2986f7d167306cdec9048c337cdcf2e1' '377d0eb1df251808b8280d1aec598b4a2986f7d167306cdec9048c337cdcf2e1'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
@@ -389,7 +389,7 @@ case $_basever in
'19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a' '19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
'b302ba6c5bbe8ed19b20207505d513208fae1e678cf4d8e7ac0b154e5fe3f456' 'b302ba6c5bbe8ed19b20207505d513208fae1e678cf4d8e7ac0b154e5fe3f456'
'073e7b8ab48aa9abdb5cedb5c729a2f624275ebdbe1769476231c9e712145496' '073e7b8ab48aa9abdb5cedb5c729a2f624275ebdbe1769476231c9e712145496'
'f408b327ff4e6f1ee2343cfe69430b1e0b6fb40e263f1ec8a3a1eab559e23175' '0b66da5f767c66a40a36e8deaa2e384a20421328dc7cb454221c2dd44fee8a0b'
'6c831d7cdfe4897656b76c4ec60e0a18d6f3618f79c402ebc3bf4453a6616319' '6c831d7cdfe4897656b76c4ec60e0a18d6f3618f79c402ebc3bf4453a6616319'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
@@ -451,7 +451,7 @@ case $_basever in
'19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a' '19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
'b302ba6c5bbe8ed19b20207505d513208fae1e678cf4d8e7ac0b154e5fe3f456' 'b302ba6c5bbe8ed19b20207505d513208fae1e678cf4d8e7ac0b154e5fe3f456'
'540dda70cccc0cb23f0d0311f9947209cfe377070620e5fca69f66cc1efe817e' '540dda70cccc0cb23f0d0311f9947209cfe377070620e5fca69f66cc1efe817e'
'99f163ef979711ca1cda9c2c45a30b026c966b4d48d6ca307a0d537f28b740ac' '27f284aa9e0365224ecf1534619ac14d5ffe8a6941ac20502e2c370d272542c5'
'c6c5bcfac976c2304bdd13b80f8ad0329e5e53a6d9e9d130115204ea09fe2848' 'c6c5bcfac976c2304bdd13b80f8ad0329e5e53a6d9e9d130115204ea09fe2848'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
@@ -514,7 +514,7 @@ case $_basever in
'9ec679871cba674cf876ba836cde969296ae5034bcc10e1ec39b372e6e07aab0' '9ec679871cba674cf876ba836cde969296ae5034bcc10e1ec39b372e6e07aab0'
'0e3473c19e5513bee886f03cf2476f746d8b5b2fbc0841c9d60d609b16a97c14' '0e3473c19e5513bee886f03cf2476f746d8b5b2fbc0841c9d60d609b16a97c14'
'f5ed3062543074472172e30f3db4baa1e292b50e11c1c19e2511b71b28ac7e48' 'f5ed3062543074472172e30f3db4baa1e292b50e11c1c19e2511b71b28ac7e48'
'99f163ef979711ca1cda9c2c45a30b026c966b4d48d6ca307a0d537f28b740ac' '27f284aa9e0365224ecf1534619ac14d5ffe8a6941ac20502e2c370d272542c5'
'b0004bc559653fd8719b8adcfa1ead1075db3425d30d7d7adb8cbc6296386a8f' 'b0004bc559653fd8719b8adcfa1ead1075db3425d30d7d7adb8cbc6296386a8f'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
@@ -571,7 +571,7 @@ case $_basever in
'efe5e21706fdf64559ead866c85a5d88c5c3f743d814410df3810ca61cc5b966' 'efe5e21706fdf64559ead866c85a5d88c5c3f743d814410df3810ca61cc5b966'
'5742277f41f22bf29fa9742562946b8a01377f8a22adb42ceed3607541c1d5b6' '5742277f41f22bf29fa9742562946b8a01377f8a22adb42ceed3607541c1d5b6'
'5bd2e13d3c70abe4efefa1c4374a5d3801fece087f093ce6a8ca5b8466dc1f20' '5bd2e13d3c70abe4efefa1c4374a5d3801fece087f093ce6a8ca5b8466dc1f20'
'99f163ef979711ca1cda9c2c45a30b026c966b4d48d6ca307a0d537f28b740ac' '27f284aa9e0365224ecf1534619ac14d5ffe8a6941ac20502e2c370d272542c5'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
'1565038792869f1e99dc321b57d00dbfa14ab824a995f39c4d3effceab0b5415' '1565038792869f1e99dc321b57d00dbfa14ab824a995f39c4d3effceab0b5415'
@@ -625,7 +625,7 @@ case $_basever in
'6c4f0099896f69e56ebd8c9eac266ac8ad993acecd50945e0e84ef6f95f9ddca' '6c4f0099896f69e56ebd8c9eac266ac8ad993acecd50945e0e84ef6f95f9ddca'
'c8f7c50d9b1418ba22b5ca735c47111a162be416109714d26a674162e5b2cb97' 'c8f7c50d9b1418ba22b5ca735c47111a162be416109714d26a674162e5b2cb97'
'63a2ddf7ca9d3922f4eac3ac66bc37ffb10ad8b18b3e596832d3faa66b93dfa6' '63a2ddf7ca9d3922f4eac3ac66bc37ffb10ad8b18b3e596832d3faa66b93dfa6'
'671f48e40f2a99542860a48000f8b7bcc071aeebb488b5c412f2767d6ab3ab22' '00b452910c68fba6dcebbf6c064beff565b2c60ac07a9c1a3375b8bf0354911f'
'68659b54bd0c0539c22869feea8017faf947af6883d75c00089f2bfd9f265f8e' '68659b54bd0c0539c22869feea8017faf947af6883d75c00089f2bfd9f265f8e'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'978b197efa56781a1d5651a3649c3d8b926d55748b4b9063788dfe1a861fc1bc' '978b197efa56781a1d5651a3649c3d8b926d55748b4b9063788dfe1a861fc1bc'
@@ -677,7 +677,7 @@ case $_basever in
'fca63d15ca4502aebd73e76d7499b243d2c03db71ff5ab0bf5cf268b2e576320' 'fca63d15ca4502aebd73e76d7499b243d2c03db71ff5ab0bf5cf268b2e576320'
'19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a' '19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
'9df628fd530950e37d31da854cb314d536f33c83935adf5c47e71266a55f7004' '9df628fd530950e37d31da854cb314d536f33c83935adf5c47e71266a55f7004'
'd2e22ac5884cebf8bec596c6fd4a66632d7f5463a06c7b265dae2684984ad536' '4a52785cca539b37c1250e6e6776dda13dc43bb6ec8991b7c1ed3bff42e289d7'
'44a46815d26170e43dd5f21e352081c8e5a4816512abb86353a1d90311fffcde' '44a46815d26170e43dd5f21e352081c8e5a4816512abb86353a1d90311fffcde'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
@@ -730,7 +730,7 @@ case $_basever in
'19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a' '19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
#'4503034f211de3013f8500106da753e5d1bcac14bc5576671cbe6f574805b3cd' #'4503034f211de3013f8500106da753e5d1bcac14bc5576671cbe6f574805b3cd'
'9df628fd530950e37d31da854cb314d536f33c83935adf5c47e71266a55f7004' '9df628fd530950e37d31da854cb314d536f33c83935adf5c47e71266a55f7004'
'd2e22ac5884cebf8bec596c6fd4a66632d7f5463a06c7b265dae2684984ad536' '4a52785cca539b37c1250e6e6776dda13dc43bb6ec8991b7c1ed3bff42e289d7'
'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' '9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' 'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
'ba65acd3f1168a7479e3665b5b13f7d1066e713eadb5a0e5110423ba97d7ccd3' 'ba65acd3f1168a7479e3665b5b13f7d1066e713eadb5a0e5110423ba97d7ccd3'
@@ -780,7 +780,7 @@ case $_basever in
#'fca63d15ca4502aebd73e76d7499b243d2c03db71ff5ab0bf5cf268b2e576320' #'fca63d15ca4502aebd73e76d7499b243d2c03db71ff5ab0bf5cf268b2e576320'
'19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a' '19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a'
'9df628fd530950e37d31da854cb314d536f33c83935adf5c47e71266a55f7004' '9df628fd530950e37d31da854cb314d536f33c83935adf5c47e71266a55f7004'
'd20e3fc269c1cf74943281ce2c2c3af32ecd6468802a8d6dde1bafbcc82ca2b4' '057631ecc148b41e0037d200a69cbbfbed8cdcf27eede3d8cd6936566b6ebc68'
#'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177' #'9fad4a40449e09522899955762c8928ae17f4cdaa16e01239fd12592e9d58177'
#'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911' #'a557b342111849a5f920bbe1c129f3ff1fc1eff62c6bd6685e0972fc88e39911'
#'95fd78b725360742ead8c55eea7e3ff7ac8ae11ae1a21a0d881e168a841bc9b4' #'95fd78b725360742ead8c55eea7e3ff7ac8ae11ae1a21a0d881e168a841bc9b4'

View File

@@ -3716,7 +3716,7 @@ diff --git a/drivers/misc/winesync.c b/drivers/misc/winesync.c
index 27d5baa457df..0f8a8a94eef8 100644 index 27d5baa457df..0f8a8a94eef8 100644
--- a/drivers/misc/winesync.c --- a/drivers/misc/winesync.c
+++ b/drivers/misc/winesync.c +++ b/drivers/misc/winesync.c
@@ -639,6 +639,34 @@ static int winesync_read_mutex(struct winesync_device *dev, void __user *argp) @@ -639,6 +639,33 @@ static int winesync_read_mutex(struct winesync_device *dev, void __user *argp)
return ret; return ret;
} }
@@ -3726,7 +3726,6 @@ index 27d5baa457df..0f8a8a94eef8 100644
+ struct winesync_event_args args; + struct winesync_event_args args;
+ struct winesync_obj *event; + struct winesync_obj *event;
+ __u32 id; + __u32 id;
+ int ret;
+ +
+ if (get_user(id, &user_args->event)) + if (get_user(id, &user_args->event))
+ return -EFAULT; + return -EFAULT;
@@ -3745,7 +3744,7 @@ index 27d5baa457df..0f8a8a94eef8 100644
+ +
+ if (copy_to_user(user_args, &args, sizeof(args))) + if (copy_to_user(user_args, &args, sizeof(args)))
+ return -EFAULT; + return -EFAULT;
+ return ret; + return 0;
+} +}
+ +
/* /*

View File

@@ -3716,7 +3716,7 @@ diff --git a/drivers/misc/winesync.c b/drivers/misc/winesync.c
index 27d5baa457df..0f8a8a94eef8 100644 index 27d5baa457df..0f8a8a94eef8 100644
--- a/drivers/misc/winesync.c --- a/drivers/misc/winesync.c
+++ b/drivers/misc/winesync.c +++ b/drivers/misc/winesync.c
@@ -639,6 +639,34 @@ static int winesync_read_mutex(struct winesync_device *dev, void __user *argp) @@ -639,6 +639,33 @@ static int winesync_read_mutex(struct winesync_device *dev, void __user *argp)
return ret; return ret;
} }
@@ -3726,7 +3726,6 @@ index 27d5baa457df..0f8a8a94eef8 100644
+ struct winesync_event_args args; + struct winesync_event_args args;
+ struct winesync_obj *event; + struct winesync_obj *event;
+ __u32 id; + __u32 id;
+ int ret;
+ +
+ if (get_user(id, &user_args->event)) + if (get_user(id, &user_args->event))
+ return -EFAULT; + return -EFAULT;
@@ -3745,7 +3744,7 @@ index 27d5baa457df..0f8a8a94eef8 100644
+ +
+ if (copy_to_user(user_args, &args, sizeof(args))) + if (copy_to_user(user_args, &args, sizeof(args)))
+ return -EFAULT; + return -EFAULT;
+ return ret; + return 0;
+} +}
+ +
/* /*

View File

@@ -3716,7 +3716,7 @@ diff --git a/drivers/misc/winesync.c b/drivers/misc/winesync.c
index 27d5baa457df..0f8a8a94eef8 100644 index 27d5baa457df..0f8a8a94eef8 100644
--- a/drivers/misc/winesync.c --- a/drivers/misc/winesync.c
+++ b/drivers/misc/winesync.c +++ b/drivers/misc/winesync.c
@@ -639,6 +639,34 @@ static int winesync_read_mutex(struct winesync_device *dev, void __user *argp) @@ -639,6 +639,33 @@ static int winesync_read_mutex(struct winesync_device *dev, void __user *argp)
return ret; return ret;
} }
@@ -3726,7 +3726,6 @@ index 27d5baa457df..0f8a8a94eef8 100644
+ struct winesync_event_args args; + struct winesync_event_args args;
+ struct winesync_obj *event; + struct winesync_obj *event;
+ __u32 id; + __u32 id;
+ int ret;
+ +
+ if (get_user(id, &user_args->event)) + if (get_user(id, &user_args->event))
+ return -EFAULT; + return -EFAULT;
@@ -3745,7 +3744,7 @@ index 27d5baa457df..0f8a8a94eef8 100644
+ +
+ if (copy_to_user(user_args, &args, sizeof(args))) + if (copy_to_user(user_args, &args, sizeof(args)))
+ return -EFAULT; + return -EFAULT;
+ return ret; + return 0;
+} +}
+ +
/* /*

View File

@@ -3716,7 +3716,7 @@ diff --git a/drivers/misc/winesync.c b/drivers/misc/winesync.c
index 27d5baa457df..0f8a8a94eef8 100644 index 27d5baa457df..0f8a8a94eef8 100644
--- a/drivers/misc/winesync.c --- a/drivers/misc/winesync.c
+++ b/drivers/misc/winesync.c +++ b/drivers/misc/winesync.c
@@ -639,6 +639,34 @@ static int winesync_read_mutex(struct winesync_device *dev, void __user *argp) @@ -639,6 +639,33 @@ static int winesync_read_mutex(struct winesync_device *dev, void __user *argp)
return ret; return ret;
} }
@@ -3726,7 +3726,6 @@ index 27d5baa457df..0f8a8a94eef8 100644
+ struct winesync_event_args args; + struct winesync_event_args args;
+ struct winesync_obj *event; + struct winesync_obj *event;
+ __u32 id; + __u32 id;
+ int ret;
+ +
+ if (get_user(id, &user_args->event)) + if (get_user(id, &user_args->event))
+ return -EFAULT; + return -EFAULT;
@@ -3745,7 +3744,7 @@ index 27d5baa457df..0f8a8a94eef8 100644
+ +
+ if (copy_to_user(user_args, &args, sizeof(args))) + if (copy_to_user(user_args, &args, sizeof(args)))
+ return -EFAULT; + return -EFAULT;
+ return ret; + return 0;
+} +}
+ +
/* /*

View File

@@ -3716,7 +3716,7 @@ diff --git a/drivers/misc/winesync.c b/drivers/misc/winesync.c
index 27d5baa457df..0f8a8a94eef8 100644 index 27d5baa457df..0f8a8a94eef8 100644
--- a/drivers/misc/winesync.c --- a/drivers/misc/winesync.c
+++ b/drivers/misc/winesync.c +++ b/drivers/misc/winesync.c
@@ -639,6 +639,34 @@ static int winesync_read_mutex(struct winesync_device *dev, void __user *argp) @@ -639,6 +639,33 @@ static int winesync_read_mutex(struct winesync_device *dev, void __user *argp)
return ret; return ret;
} }
@@ -3726,7 +3726,6 @@ index 27d5baa457df..0f8a8a94eef8 100644
+ struct winesync_event_args args; + struct winesync_event_args args;
+ struct winesync_obj *event; + struct winesync_obj *event;
+ __u32 id; + __u32 id;
+ int ret;
+ +
+ if (get_user(id, &user_args->event)) + if (get_user(id, &user_args->event))
+ return -EFAULT; + return -EFAULT;
@@ -3745,7 +3744,7 @@ index 27d5baa457df..0f8a8a94eef8 100644
+ +
+ if (copy_to_user(user_args, &args, sizeof(args))) + if (copy_to_user(user_args, &args, sizeof(args)))
+ return -EFAULT; + return -EFAULT;
+ return ret; + return 0;
+} +}
+ +
/* /*

View File

@@ -3717,7 +3717,7 @@ diff --git a/drivers/misc/winesync.c b/drivers/misc/winesync.c
index 27d5baa457df..0f8a8a94eef8 100644 index 27d5baa457df..0f8a8a94eef8 100644
--- a/drivers/misc/winesync.c --- a/drivers/misc/winesync.c
+++ b/drivers/misc/winesync.c +++ b/drivers/misc/winesync.c
@@ -639,6 +639,34 @@ static int winesync_read_mutex(struct winesync_device *dev, void __user *argp) @@ -639,6 +639,33 @@ static int winesync_read_mutex(struct winesync_device *dev, void __user *argp)
return ret; return ret;
} }
@@ -3727,7 +3727,6 @@ index 27d5baa457df..0f8a8a94eef8 100644
+ struct winesync_event_args args; + struct winesync_event_args args;
+ struct winesync_obj *event; + struct winesync_obj *event;
+ __u32 id; + __u32 id;
+ int ret;
+ +
+ if (get_user(id, &user_args->event)) + if (get_user(id, &user_args->event))
+ return -EFAULT; + return -EFAULT;
@@ -3746,7 +3745,7 @@ index 27d5baa457df..0f8a8a94eef8 100644
+ +
+ if (copy_to_user(user_args, &args, sizeof(args))) + if (copy_to_user(user_args, &args, sizeof(args)))
+ return -EFAULT; + return -EFAULT;
+ return ret; + return 0;
+} +}
+ +
/* /*

View File

@@ -3717,7 +3717,7 @@ diff --git a/drivers/misc/winesync.c b/drivers/misc/winesync.c
index 27d5baa457df..0f8a8a94eef8 100644 index 27d5baa457df..0f8a8a94eef8 100644
--- a/drivers/misc/winesync.c --- a/drivers/misc/winesync.c
+++ b/drivers/misc/winesync.c +++ b/drivers/misc/winesync.c
@@ -639,6 +639,34 @@ static int winesync_read_mutex(struct winesync_device *dev, void __user *argp) @@ -639,6 +639,33 @@ static int winesync_read_mutex(struct winesync_device *dev, void __user *argp)
return ret; return ret;
} }
@@ -3727,7 +3727,6 @@ index 27d5baa457df..0f8a8a94eef8 100644
+ struct winesync_event_args args; + struct winesync_event_args args;
+ struct winesync_obj *event; + struct winesync_obj *event;
+ __u32 id; + __u32 id;
+ int ret;
+ +
+ if (get_user(id, &user_args->event)) + if (get_user(id, &user_args->event))
+ return -EFAULT; + return -EFAULT;
@@ -3746,7 +3745,7 @@ index 27d5baa457df..0f8a8a94eef8 100644
+ +
+ if (copy_to_user(user_args, &args, sizeof(args))) + if (copy_to_user(user_args, &args, sizeof(args)))
+ return -EFAULT; + return -EFAULT;
+ return ret; + return 0;
+} +}
+ +
/* /*

View File

@@ -3717,7 +3717,7 @@ diff --git a/drivers/misc/winesync.c b/drivers/misc/winesync.c
index 27d5baa457df..0f8a8a94eef8 100644 index 27d5baa457df..0f8a8a94eef8 100644
--- a/drivers/misc/winesync.c --- a/drivers/misc/winesync.c
+++ b/drivers/misc/winesync.c +++ b/drivers/misc/winesync.c
@@ -639,6 +639,34 @@ static int winesync_read_mutex(struct winesync_device *dev, void __user *argp) @@ -639,6 +639,33 @@ static int winesync_read_mutex(struct winesync_device *dev, void __user *argp)
return ret; return ret;
} }
@@ -3727,7 +3727,6 @@ index 27d5baa457df..0f8a8a94eef8 100644
+ struct winesync_event_args args; + struct winesync_event_args args;
+ struct winesync_obj *event; + struct winesync_obj *event;
+ __u32 id; + __u32 id;
+ int ret;
+ +
+ if (get_user(id, &user_args->event)) + if (get_user(id, &user_args->event))
+ return -EFAULT; + return -EFAULT;
@@ -3746,7 +3745,7 @@ index 27d5baa457df..0f8a8a94eef8 100644
+ +
+ if (copy_to_user(user_args, &args, sizeof(args))) + if (copy_to_user(user_args, &args, sizeof(args)))
+ return -EFAULT; + return -EFAULT;
+ return ret; + return 0;
+} +}
+ +
/* /*

View File

@@ -3718,7 +3718,7 @@ diff --git a/drivers/misc/winesync.c b/drivers/misc/winesync.c
index 27d5baa457df..0f8a8a94eef8 100644 index 27d5baa457df..0f8a8a94eef8 100644
--- a/drivers/misc/winesync.c --- a/drivers/misc/winesync.c
+++ b/drivers/misc/winesync.c +++ b/drivers/misc/winesync.c
@@ -639,6 +639,34 @@ static int winesync_read_mutex(struct winesync_device *dev, void __user *argp) @@ -639,6 +639,33 @@ static int winesync_read_mutex(struct winesync_device *dev, void __user *argp)
return ret; return ret;
} }
@@ -3728,7 +3728,6 @@ index 27d5baa457df..0f8a8a94eef8 100644
+ struct winesync_event_args args; + struct winesync_event_args args;
+ struct winesync_obj *event; + struct winesync_obj *event;
+ __u32 id; + __u32 id;
+ int ret;
+ +
+ if (get_user(id, &user_args->event)) + if (get_user(id, &user_args->event))
+ return -EFAULT; + return -EFAULT;
@@ -3747,7 +3746,7 @@ index 27d5baa457df..0f8a8a94eef8 100644
+ +
+ if (copy_to_user(user_args, &args, sizeof(args))) + if (copy_to_user(user_args, &args, sizeof(args)))
+ return -EFAULT; + return -EFAULT;
+ return ret; + return 0;
+} +}
+ +
/* /*